X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-search.pl;h=fda58b227844affb2135097c4d839788984dc6f4;hb=a3ceef434ed17a1a1ad57c70cfbbc8f1fdf5d736;hp=34491c355d425b67d4bdda23eaf407b89e08dde0;hpb=dc0b98eb9e52f8a7c3bc39a5042aa3004af49722;p=srvgit diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 34491c355d..fda58b2278 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -431,7 +431,7 @@ if ($@ || $error) { # At this point, each server has given us a result set # now we build that set for template display my @sup_results_array; -for (my $i=0;$i<=@servers;$i++) { +for (my $i=0;$i<@servers;$i++) { my $server = $servers[$i]; if ($server && $server =~/biblioserver/) { # this is the local bibliographic server $hits = $results_hashref->{$server}->{"hits"}; @@ -442,12 +442,13 @@ for (my $i=0;$i<=@servers;$i++) { # because pazGetRecords handles retieving only the records # 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, + my @group_results = searchResults( 'opac', $query_desc, $group->{'group_count'},$results_per_page, 0, $scan, @{ $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"}},, C4::Context->preference('hidelostitems')); + @newresults = searchResults('opac', $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 @@ -481,10 +482,10 @@ for (my $i=0;$i<=@servers;$i++) { } # Adding the new search if needed - if ($borrowernumber eq '') { + if (!$borrowernumber || $borrowernumber eq '') { # To a cookie (the user is not logged in) - if ($params->{'offset'} eq '') { + if (($params->{'offset'}||'') eq '') { push @recentSearches, { "query_desc" => $query_desc || "unknown", @@ -506,7 +507,7 @@ for (my $i=0;$i<=@servers;$i++) { } else { # To the session (the user is logged in) - if ($params->{'offset'} eq '') { + if (($params->{'offset'}||'') eq '') { AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc, $query_cgi, $total); $template->param(ShowOpacRecentSearchLink => 1); } @@ -599,7 +600,6 @@ for (my $i=0;$i<=@servers;$i++) { for my $sup_record ( @{$results_hashref->{$server}->{"RECORDS"}} ) { my $marc_record_object = MARC::Record->new_from_usmarc($sup_record); my $title_field = $marc_record_object->field(100); - warn "Authority Found: ".$marc_record_object->as_formatted(); push @inner_sup_results_array, { 'title' => $title_field->subfield('a'), 'link' => "&idx=an&q=".$marc_record_object->field('001')->as_string(),