bug 3219: handle variation in Amazon responses

[koha_fer] / opac / opac-search.pl

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index f32ffc3..ae7f4ea 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -3,6 +3,7 @@
 # Mostly copied from search.pl, see POD there
 use strict;            # always use
 use warnings;
+
 ## STEP 1. Load things that are used in both search page and
 # results page and decide which template to load, operations 
 # to perform, etc.
@@ -74,6 +75,9 @@ elsif ($cgi->param("format") && $cgi->param("format") eq 'opensearchdescription'
 if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
     $template->param('UNIMARC' => 1);
 }
+if (C4::Context->preference("marcflavour") eq "MARC21" ) {
+    $template->param('usmarc' => 1);
+}
 
 if (C4::Context->preference('BakerTaylorEnabled')) {
        $template->param(
@@ -115,10 +119,15 @@ if (C4::Context->preference('TagsEnabled')) {
 #}
 
 # load the branches
+my $mybranch = ( C4::Context->preference( 'SearchMyLibraryFirst' ) && C4::Context->userenv ) ? C4::Context->userenv->{branch} : '';
 my $branches = GetBranches();
 # FIXME: next line duplicates GetBranchesLoop(0,0);
 my @branch_loop = map {
-                    {value => $_, branchname => $branches->{$_}->{branchname}}
+                    {
+                        value => $_,
+                        branchname => $branches->{$_}->{branchname},
+                        selected => ( $mybranch eq $_ ) ? 1 : 0
+                    }
                 } sort {
                     $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}
                 } keys %$branches;
@@ -172,7 +181,7 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
 # $template->param(itypeloop=>\@itype_loop,);
 
 # The following should only be loaded if we're bringing up the advanced search template
-if ( $template_type eq 'advsearch' ) {
+if ( $template_type && $template_type eq 'advsearch' ) {
 
     # load the servers (used for searching -- to do federated searching, etc.)
     my $primary_servers_loop;# = displayPrimaryServers();
@@ -221,7 +230,7 @@ if ( $template_type eq 'advsearch' ) {
                       search_boxes_loop => \@search_boxes_array);
 
 # use the global setting by default
-       if ( C4::Context->preference("expandedSearchOption") == 1) {
+       if ( C4::Context->preference("expandedSearchOption") ) {
                $template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
        }
        # but let the user override it
@@ -273,7 +282,8 @@ my @operators;
 
 # indexes are query qualifiers, like 'title', 'author', etc. They
 # can be single or multiple parameters separated by comma: kw,right-Truncation 
-my @indexes = exists($params->{'idx'}) ? split("\0",$params->{'idx'}) : ();
+my @indexes;
+@indexes = split("\0",$params->{'idx'}) if $params->{'idx'};
 
 # if a simple index (only one)  display the index used in the top search box
 if ($indexes[0] && !$indexes[1]) {
@@ -371,6 +381,7 @@ my $total = 0; # the total results for the whole set
 my $facets; # this object stores the faceted results that display on the left-hand of the results page
 my @results_array;
 my $results_hashref;
+my @coins;
 
 if ($tag) {
        my $taglist = get_tags({term=>$tag, approved=>1});
@@ -431,8 +442,14 @@ for (my $i=0;$i<=@servers;$i++) {
                                $_ ->{'TagLoop'} = get_tags({biblionumber=>$bibnum, approved=>1, 'sort'=>'-weight',
                                                                                limit=>$tag_quantity });
                        }
-               }       
-        $total = $total + $results_hashref->{$server}->{"hits"} if $results_hashref->{$server}->{"hits"};
+               }
+               foreach (@newresults) {
+                   $_->{coins} = GetCOinSBiblio($_->{'biblionumber'});
+               }
+      
+       if ($results_hashref->{$server}->{"hits"}){
+           $total = $total + $results_hashref->{$server}->{"hits"};
+       }
         ## If there's just one result, redirect to the detail page
         if ($total == 1) {         
             my $biblionumber=$newresults[0]->{biblionumber};
@@ -593,11 +610,6 @@ if ( C4::Context->preference("kohaspsuggest") ) {
 }
 
 # VI. BUILD THE TEMPLATE
-# NOTE: not using application/atom+xml or application/rss+xml beccause of Internet Explorer 6;
-# see bug 2078.
-my $content_type = ($cgi->param('format') && $cgi->param('format') =~ /rss|atom/) ? "application/xml" :
-                   "text/html";
-
 # Build drop-down list for 'Add To:' menu...
 my $session = get_session($cgi->cookie("CGISESSID"));
 my @addpubshelves;
@@ -618,4 +630,14 @@ if (defined $barshelves) {
        $template->param( addbarshelvesloop => $barshelves);
 }
 
-output_html_with_http_headers $cgi, $cookie, $template->output, $content_type;
+my $content_type;
+
+if ($cgi->param('format') && $cgi->param('format') =~ /rss/) {
+    $content_type = 'rss'
+} elsif ($cgi->param('format') && $cgi->param('format') =~ /atom/) {
+    $content_type = 'atom'
+} else {
+    $content_type = 'html'
+}
+
+output_with_http_headers $cgi, $cookie, $template->output, $content_type;