[Koha-cvs] koha/opac search [dev_week]

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/09/23 21:47:25

Modified files:
        opac           : search 

Log message:
        fix sort_by to display in both adv-search and results 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/opac/search?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: search
===================================================================
RCS file: /sources/koha/koha/opac/Attic/search,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- search      23 Sep 2006 21:36:24 -0000      1.1.2.3
+++ search      23 Sep 2006 21:47:25 -0000      1.1.2.4
@@ -2,7 +2,7 @@
 # Script to perform searching
 # For documentation try 'perldoc /path/to/search'
 #
-# $Header: /sources/koha/koha/opac/Attic/search,v 1.1.2.3 2006/09/23 21:36:24 
kados Exp $
+# $Header: /sources/koha/koha/opac/Attic/search,v 1.1.2.4 2006/09/23 21:47:25 
kados Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -236,6 +236,7 @@
 if($languages_count > 1){
         $template->param(languages => address@hidden);
 }
+
 # The following should only be loaded if we're bringing up the advanced search 
template
 if ( $template_name eq "opac-advsearch.tmpl" ) {
 
@@ -295,6 +296,12 @@
 
     my $expanded_options = $cgi->param('expanded_options');
     $template->param(expanded_options => $expanded_options);
+
+       # load the sort_by options for the template
+       my $sort_by = $cgi->param('sort_by');
+       my $sort_by_loop = displaySortby($sort_by);
+       $template->param(sort_by_loop => $sort_by_loop);
+
     #warn "loading the template";
     output_html_with_http_headers $cgi, $cookie, $template->output;
     exit;
@@ -309,6 +316,13 @@
 my $params = $cgi->Vars;
 
 # Params that can have more than one value
+# sort by is used to sort the query
+my @sort_by;
address@hidden = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
+# load the sort_by options for the template
+my $sort_by = $params->{'sort_by'};
+my $sort_by_loop = displaySortby($sort_by);
+$template->param(sort_by_loop => $sort_by_loop);
 #
 # Use the servers defined, or just search our local catalog(default)
 my @servers;
@@ -346,13 +360,6 @@
 push @limits, map "yr:".$_, split("\0",$params->{'limit-yr'}) if 
$params->{'limit-yr'};
 
 # Params that can only have one value
-# sort by is used to sort the query
-my @sort_by;
address@hidden = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
-# load the sort_by options for the template
-my $sort_by = $params->{'sort_by'};
-my $sort_by_loop = displaySortby($sort_by);
-$template->param(sort_by_loop => $sort_by_loop);
 my $query = $params->{'q'};
 my $scan = $params->{'scan'};
 my $results_per_page = $params->{'count'} || 20;