From a182bcfc985a12ec24eeaf69d262871e4c9a581b Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Mon, 29 Aug 2011 15:35:45 +1200 Subject: [PATCH] Bug 6656 : Fix for advanced search not respecting default sort order Rebase for 3.4.x Signed-off-by: Nicole C. Engard --- catalogue/search.pl | 10 +++++++--- opac/opac-search.pl | 11 +++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 8899d59..d9f8a2c 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -289,9 +289,13 @@ if ( $template_type eq 'advsearch' ) { $template->param(outer_sup_servers_loop => $secondary_servers_loop,); # set the default sorting - my $default_sort_by = C4::Context->preference('defaultSortField')."_".C4::Context->preference('defaultSortOrder') - if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder')); - $template->param($default_sort_by => 1); + if ( C4::Context->preference('OPACdefaultSortField') + && C4::Context->preference('OPACdefaultSortOrder') ) { + my $default_sort_by = + C4::Context->preference('defaultSortField') . '_' + . C4::Context->preference('defaultSortOrder'); + $template->param( sort_by => $default_sort_by ); + } # determine what to display next to the search boxes (ie, boolean option # shouldn't appear on the first one, scan indexes should, adding a new diff --git a/opac/opac-search.pl b/opac/opac-search.pl index b463fd3..9bdc648 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -198,7 +198,6 @@ $template->param(itemtypeloop => \@itemtypesloop); # The following should only be loaded if we're bringing up the advanced search template if ( $template_type && $template_type eq 'advsearch' ) { - # load the servers (used for searching -- to do federated searching, etc.) my $primary_servers_loop;# = displayPrimaryServers(); $template->param(outer_servers_loop => $primary_servers_loop,); @@ -207,9 +206,13 @@ if ( $template_type && $template_type eq 'advsearch' ) { $template->param(outer_sup_servers_loop => $secondary_servers_loop,); # set the default sorting - my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') - if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder')); - $template->param($default_sort_by => 1); + if ( C4::Context->preference('OPACdefaultSortField') + && C4::Context->preference('OPACdefaultSortOrder') ) { + my $default_sort_by = + C4::Context->preference('OPACdefaultSortField') . '_' + . C4::Context->preference('OPACdefaultSortOrder'); + $template->param( sort_by => $default_sort_by ); + } # determine what to display next to the search boxes (ie, boolean option # shouldn't appear on the first one, scan indexes should, adding a new -- 1.7.4.1