suggestion.pl has to be updated on C4/Budgets

[koha_fer] / opac / opac-search.pl

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 7169106..b920a88 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -15,8 +15,10 @@ use C4::Search;
 use C4::Biblio;  # GetBiblioData
 use C4::Koha;
 use C4::Tags qw(get_tags);
-use POSIX qw(ceil floor strftime);
 use C4::Branch; # GetBranches
+use POSIX qw(ceil floor strftime);
+use URI::Escape;
+use Storable qw(thaw freeze);
 
 # create a new CGI object
 # FIXME: no_undef_params needs to be tested
@@ -73,6 +75,7 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
 elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
     $template->param('usmarc' => 1);
 }
+$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 
 if (C4::Context->preference('BakerTaylorEnabled')) {
        $template->param(
@@ -144,8 +147,8 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
        push @itemtypesloop, \%row;
        }
 } else {
-    my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
-       for my $thisitemtype (sort {$a->{'lib'} cmp $b->{'lib'}} @$advsearchtypes) {
+    my $advsearchtypes = GetAuthorisedValues($advanced_search_types, '', 'opac');
+       for my $thisitemtype (@$advsearchtypes) {
                my %row =(
                                number=>$cnt++,
                                ccl => $advanced_search_types,
@@ -171,7 +174,7 @@ if ( $template_type && $template_type eq 'advsearch' ) {
     my $primary_servers_loop;# = displayPrimaryServers();
     $template->param(outer_servers_loop =>  $primary_servers_loop,);
     
-    my $secondary_servers_loop;# = displaySecondaryServers();
+    my $secondary_servers_loop;
     $template->param(outer_sup_servers_loop => $secondary_servers_loop,);
 
     # set the default sorting
@@ -214,14 +217,15 @@ if ( $template_type && $template_type eq 'advsearch' ) {
                       search_boxes_loop => \@search_boxes_array);
 
 # use the global setting by default
-       if ( C4::Context->preference("expandedSearchOption") ) {
+       if ( C4::Context->preference("expandedSearchOption") == 1 ) {
                $template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
        }
        # but let the user override it
-       if ( $cgi->param("expanded_options") && (($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 )) ) {
-       $template->param( expanded_options => $cgi->param('expanded_options'));
-       }
-
+       if (defined $cgi->param('expanded_options')) {
+           if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) {
+           $template->param( expanded_options => $cgi->param('expanded_options'));
+           }
+        }
     output_html_with_http_headers $cgi, $cookie, $template->output;
     exit;
 }
@@ -328,7 +332,8 @@ my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_
 my @results;
 
 ## I. BUILD THE QUERY
-( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by);
+my $lang = C4::Output::getlanguagecookie($cgi);
+( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang);
 
 sub _input_cgi_parse ($) { 
     my @elements;
@@ -368,6 +373,7 @@ my $results_hashref;
 my @coins;
 
 if ($tag) {
+       $query_cgi = "tag=" .$tag . "&" . $query_cgi;
        my $taglist = get_tags({term=>$tag, approved=>1});
        $results_hashref->{biblioserver}->{hits} = scalar (@$taglist);
        my @biblist  = (map {GetBiblioData($_->{biblionumber})} @$taglist);
@@ -423,6 +429,7 @@ for (my $i=0;$i<=@servers;$i++) {
                        $tag_quantity = C4::Context->preference('TagsShowOnList')) {
                        foreach (@newresults) {
                                my $bibnum = $_->{biblionumber} or next;
+                               $_->{itemsissued} = CountItemsIssued( $bibnum );
                                $_ ->{'TagLoop'} = get_tags({biblionumber=>$bibnum, approved=>1, 'sort'=>'-weight',
                                                                                limit=>$tag_quantity });
                        }
@@ -434,7 +441,53 @@ for (my $i=0;$i<=@servers;$i++) {
        if ($results_hashref->{$server}->{"hits"}){
            $total = $total + $results_hashref->{$server}->{"hits"};
        }
-        ## If there's just one result, redirect to the detail page
+       # Opac search history
+       my $newsearchcookie;
+       if (C4::Context->preference('EnableOpacSearchHistory')) {
+           my @recentSearches; 
+ 
+           # Getting the (maybe) already sent cookie
+           my $searchcookie = $cgi->cookie('KohaOpacRecentSearches');
+           if ($searchcookie){
+               $searchcookie = uri_unescape($searchcookie);
+               if (thaw($searchcookie)) {
+                   @recentSearches = @{thaw($searchcookie)};
+               }
+           }
+ 
+           # Adding the new search if needed
+           if ($borrowernumber eq '') {
+           # To a cookie (the user is not logged in)
+ 
+               if ($params->{'offset'} eq '') {
+ 
+                   push @recentSearches, {
+                                           "query_desc" => $query_desc || "unknown", 
+                                           "query_cgi"  => $query_cgi  || "unknown", 
+                                           "time"       => time(),
+                                           "total"      => $total
+                                         };
+                   $template->param(ShowOpacRecentSearchLink => 1);
+               }
+ 
+               # Pushing the cookie back 
+               $newsearchcookie = $cgi->cookie(
+                                           -name => 'KohaOpacRecentSearches',
+                                           # We uri_escape the whole freezed structure so we're sure we won't have any encoding problems
+                                           -value => uri_escape(freeze(\@recentSearches)),
+                                           -expires => ''
+                       );
+                       $cookie = [$cookie, $newsearchcookie];
+           } 
+               else {
+           # To the session (the user is logged in)
+                       if ($params->{'offset'} eq '') {
+                               AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc, $query_cgi, $total);
+                   $template->param(ShowOpacRecentSearchLink => 1);
+               }
+           }
+       }
+    ## If there's just one result, redirect to the detail page
         if ($total == 1) {         
             my $biblionumber=$newresults[0]->{biblionumber};
             if (C4::Context->preference('BiblioDefaultView') eq 'isbd') {