X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-search.pl;h=34491c355d425b67d4bdda23eaf407b89e08dde0;hb=8c7ce82ad609cd3a4dee1e443918ccbc09024c75;hp=e56776e4618f1053a19aeaf5d730a54dd716f9b7;hpb=b61851a71cfb30d6c390d39b2223e07f3a478261;p=srvgit

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index e56776e461..34491c355d 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -1,4 +1,22 @@
 #!/usr/bin/perl
+
+# Copyright 2008 Garry Collum and the Koha Koha Development team
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 # Script to perform searching
 # Mostly copied from search.pl, see POD there
 use strict;            # always use
@@ -22,6 +40,7 @@ use URI::Escape;
 use Storable qw(thaw freeze);
 
 
+my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
 # create a new CGI object
 # FIXME: no_undef_params needs to be tested
 use CGI qw('-no_undef_params');
@@ -359,11 +378,11 @@ $template->param ( QUERY_INPUTS => \@query_inputs );
 my @limit_inputs = $limit_cgi ? _input_cgi_parse($limit_cgi) : ();
 
 # add OPAC 'hidelostitems'
-if (C4::Context->preference('hidelostitems') == 1) {
-    # either lost ge 0 or no value in the lost register
-    $query ="($query) and ( (lost,st-numeric <= 0) or ( allrecords,AlwaysMatches='' not lost,AlwaysMatches='') )";
-}
-
+#if (C4::Context->preference('hidelostitems') == 1) {
+#    # either lost ge 0 or no value in the lost register
+#    $query ="($query) and ( (lost,st-numeric <= 0) or ( allrecords,AlwaysMatches='' not lost,AlwaysMatches='') )";
+#}
+#
 # add OPAC suppression - requires at least one item indexed with Suppress
 if (C4::Context->preference('OpacSuppression')) {
     $query = "($query) not Suppress=1";
@@ -424,11 +443,11 @@ for (my $i=0;$i<=@servers;$i++) {
                 # we want as specified by $offset and $results_per_page,
                 # we need to set the offset parameter of searchResults to 0
                 my @group_results = searchResults( $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
-                                                   @{ $group->{"RECORDS"} });
+                                                   @{ $group->{"RECORDS"} }, C4::Context->preference('hidelostitems'));
                 push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results };
             }
         } else {
-            @newresults = searchResults( $query_desc,$hits,$results_per_page,$offset,$scan,@{$results_hashref->{$server}->{"RECORDS"}});
+            @newresults = searchResults( $query_desc,$hits,$results_per_page,$offset,$scan,@{$results_hashref->{$server}->{"RECORDS"}},, C4::Context->preference('hidelostitems'));
         }
 		my $tag_quantity;
 		if (C4::Context->preference('TagsEnabled') and
@@ -494,7 +513,8 @@ for (my $i=0;$i<=@servers;$i++) {
  	    }
  	}
     ## If there's just one result, redirect to the detail page
-        if ($total == 1) {         
+        if ($total == 1 && $format ne 'rss2'
+	    && $format ne 'opensearchdescription' && $format ne 'atom') {   
             my $biblionumber=$newresults[0]->{biblionumber};
             if (C4::Context->preference('BiblioDefaultView') eq 'isbd') {
                 print $cgi->redirect("/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=$biblionumber");
@@ -514,6 +534,7 @@ for (my $i=0;$i<=@servers;$i++) {
             $template->param(query_cgi => $query_cgi);
             $template->param(query_desc => $query_desc);
             $template->param(limit_desc => $limit_desc);
+            $template->param(DisplayMultiPlaceHold => $DisplayMultiPlaceHold);
             if ($query_desc || $limit_desc) {
                 $template->param(searchdesc => 1);
             }