Add Syndetics Summaries and TOC

[koha_fer] / opac / opac-search.pl

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index ddccb84..f9d51f9 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -116,11 +116,12 @@ if (C4::Context->preference('TagsEnabled')) {
 
 # load the branches
 my $branches = GetBranches();
-my @branch_loop;
-
-for my $branch_hash (sort keys %$branches) {
-    push @branch_loop, {value => "$branch_hash" , branchname => $branches->{$branch_hash}->{'branchname'}, };
-}
+# FIXME: next line duplicates GetBranchesLoop(0,0);
+my @branch_loop = map {
+                    {value => $_, branchname => $branches->{$_}->{branchname}}
+                } sort {
+                    $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}
+                } keys %$branches;
 
 my $categories = GetBranchCategories(undef,'searchdomain');
 
@@ -179,7 +180,12 @@ if ( $template_type eq 'advsearch' ) {
     
     my $secondary_servers_loop;# = displaySecondaryServers();
     $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);
+
     # 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
     # box should only appear on the last, etc.
@@ -334,7 +340,7 @@ sub _input_cgi_parse ($) {
     my @elements;
     for my $this_cgi ( split('&',shift) ) {
         next unless $this_cgi;
-        $this_cgi =~ /(.*)=(.*)/;
+        $this_cgi =~ /(.*?)=(.*)/;
         push @elements, { input_name => $1, input_value => $2 };
     }
     return @elements;