X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=opac%2Fopac-search.pl;h=e39e5479b48f7e30909fb971790b425dd583289b;hb=4fcaa4d31eb830aa648ffb8e4a67f5715701b21d;hp=81b7ce61ddc0a056e68c246fa2d47d51201c3895;hpb=649573ad244b95e1b90df7d0925f31f735ae50f7;p=koha.git diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 81b7ce61dd..e39e5479b4 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -1,7 +1,8 @@ #!/usr/bin/perl -# Copyright 2008 Garry Collum and the Koha Koha Development team +# Copyright 2008 Garry Collum and the Koha Development team # Copyright 2010 BibLibre +# Copyright 2011 KohaAloha, NZ # # This file is part of Koha. # @@ -20,14 +21,26 @@ # Script to perform searching # Mostly copied from search.pl, see POD there -use strict; # always use -use warnings; +use Modern::Perl; ## STEP 1. Load things that are used in both search page and # results page and decide which template to load, operations # to perform, etc. ## load Koha modules use C4::Context; + +my $searchengine = C4::Context->preference("SearchEngine"); +for ( $searchengine ) { + when ( /^Solr$/ ) { + warn "We use Solr"; + require 'opac/search.pl'; + exit; + } + when ( /^Zebra$/ ) { + + } +} + use C4::Output; use C4::Auth qw(:DEFAULT get_session); use C4::Languages qw(getAllLanguages); @@ -36,10 +49,13 @@ use C4::Biblio; # GetBiblioData use C4::Koha; use C4::Tags qw(get_tags); use C4::Branch; # GetBranches +use C4::SocialData; +use C4::Ratings; + use POSIX qw(ceil floor strftime); use URI::Escape; use Storable qw(thaw freeze); - +use Business::ISBN; my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold"); # create a new CGI object @@ -48,10 +64,10 @@ use CGI qw('-no_undef_params'); my $cgi = new CGI; BEGIN { - if (C4::Context->preference('BakerTaylorEnabled')) { - require C4::External::BakerTaylor; - import C4::External::BakerTaylor qw(&image_url &link_url); - } + if (C4::Context->preference('BakerTaylorEnabled')) { + require C4::External::BakerTaylor; + import C4::External::BakerTaylor qw(&image_url &link_url); + } } my ($template,$borrowernumber,$cookie); @@ -64,13 +80,13 @@ my @params = $cgi->param("limit"); my $format = $cgi->param("format") || ''; my $build_grouped_results = C4::Context->preference('OPACGroupResults'); if ($format =~ /(rss|atom|opensearchdescription)/) { - $template_name = 'opac-opensearch.tmpl'; + $template_name = 'opac-opensearch.tmpl'; } elsif (@params && $build_grouped_results) { $template_name = 'opac-results-grouped.tmpl'; } elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) ) { - $template_name = 'opac-results.tmpl'; + $template_name = 'opac-results.tmpl'; } else { $template_name = 'opac-advsearch.tmpl'; @@ -88,8 +104,16 @@ if ($template_name eq 'opac-results.tmpl') { $template->param('COinSinOPACResults' => C4::Context->preference('COinSinOPACResults')); } +# get biblionumbers stored in the cart +my @cart_list; + +if($cgi->cookie("bib_list")){ + my $cart_list = $cgi->cookie("bib_list"); + @cart_list = split(/\//, $cart_list); +} + if ($format eq 'rss2' or $format eq 'opensearchdescription' or $format eq 'atom') { - $template->param($format => 1); + $template->param($format => 1); $template->param(timestamp => strftime("%Y-%m-%dT%H:%M:%S-00:00", gmtime)) if ($format eq 'atom'); # FIXME - the timestamp is a hack - the biblio update timestamp should be used for each # entry, but not sure if that's worth an extra database query for each bib @@ -103,19 +127,23 @@ elsif (C4::Context->preference("marcflavour") eq "MARC21" ) { $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') ); $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') ); +$template->param( + OpacStarRatings => C4::Context->preference("OpacStarRatings") ); + if (C4::Context->preference('BakerTaylorEnabled')) { - $template->param( - BakerTaylorEnabled => 1, - BakerTaylorImageURL => &image_url(), - BakerTaylorLinkURL => &link_url(), - BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), - ); + $template->param( + BakerTaylorEnabled => 1, + BakerTaylorImageURL => &image_url(), + BakerTaylorLinkURL => &link_url(), + BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), + ); } + if (C4::Context->preference('TagsEnabled')) { - $template->param(TagsEnabled => 1); - foreach (qw(TagsShowOnList TagsInputOnList)) { - C4::Context->preference($_) and $template->param($_ => 1); - } + $template->param(TagsEnabled => 1); + foreach (qw(TagsShowOnList TagsInputOnList)) { + C4::Context->preference($_) and $template->param($_ => 1); + } } ## URI Re-Writing @@ -157,40 +185,47 @@ $template->param(search_languages_loop => $languages_limit_loop,); my $itemtypes = GetItemTypes; # the index parameter is different for item-level itemtypes my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; -my @itemtypesloop; -my $selected=1; +my @advancedsearchesloop; my $cnt; -my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes"); +my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes") || "itemtypes"; +my @advanced_search_types = split(/\|/, $advanced_search_types); -if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { +foreach my $advanced_srch_type (@advanced_search_types) { + if ($advanced_srch_type eq 'itemtypes') { + # itemtype is a special case, since it's not defined in authorized values + my @itypesloop; foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) { my %row =( number=>$cnt++, ccl => "$itype_or_itemtype,phr", code => $thisitemtype, - selected => $selected, description => $itemtypes->{$thisitemtype}->{'description'}, - count5 => $cnt % 4, imageurl=> getitemtypeimagelocation( 'opac', $itemtypes->{$thisitemtype}->{'imageurl'} ), ); - $selected = 0; # set to zero after first pass through - push @itemtypesloop, \%row; + push @itypesloop, \%row; } -} else { - my $advsearchtypes = GetAuthorisedValues($advanced_search_types, '', 'opac'); + my %search_code = ( advanced_search_type => $advanced_srch_type, + code_loop => \@itypesloop ); + push @advancedsearchesloop, \%search_code; + } else { + # covers all the other cases: non-itemtype authorized values + my $advsearchtypes = GetAuthorisedValues($advanced_srch_type, '', 'opac'); + my @authvalueloop; for my $thisitemtype (@$advsearchtypes) { my %row =( number=>$cnt++, - ccl => $advanced_search_types, + ccl => $advanced_srch_type, code => $thisitemtype->{authorised_value}, - selected => $selected, - description => $thisitemtype->{'lib'}, - count5 => $cnt % 4, - imageurl=> getitemtypeimagelocation( 'opac', $thisitemtype->{'imageurl'} ), - ); - push @itemtypesloop, \%row; + description => $thisitemtype->{'lib_opac'} || $thisitemtype->{'lib'}, + imageurl => getitemtypeimagelocation( 'opac', $thisitemtype->{'imageurl'} ), + ); + push @authvalueloop, \%row; } + my %search_code = ( advanced_search_type => $advanced_srch_type, + code_loop => \@authvalueloop ); + push @advancedsearchesloop, \%search_code; + } } -$template->param(itemtypeloop => \@itemtypesloop); +$template->param(advancedsearchesloop => \@advancedsearchesloop); # # load the itypes (Called item types in the template -- just authorized values for searching) # my ($itypecount,@itype_loop) = GetCcodes(); @@ -198,7 +233,6 @@ $template->param(itemtypeloop => \@itemtypesloop); # The following should only be loaded if we're bringing up the advanced search template if ( $template_type && $template_type eq 'advsearch' ) { - # load the servers (used for searching -- to do federated searching, etc.) my $primary_servers_loop;# = displayPrimaryServers(); $template->param(outer_servers_loop => $primary_servers_loop,); @@ -212,7 +246,7 @@ if ( $template_type && $template_type eq 'advsearch' ) { my $default_sort_by = C4::Context->preference('OPACdefaultSortField') . '_' . C4::Context->preference('OPACdefaultSortOrder'); - $template->param( $default_sort_by => 1 ); + $template->param( sort_by => $default_sort_by ); } # determine what to display next to the search boxes (ie, boolean option @@ -245,20 +279,20 @@ if ( $template_type && $template_type eq 'advsearch' ) { } } - $template->param(uc(C4::Context->preference("marcflavour")) => 1, # we already did this for UNIMARC - advsearch => 1, - search_boxes_loop => \@search_boxes_array); + $template->param(uc( C4::Context->preference("marcflavour")) => 1, # we already did this for UNIMARC + advsearch => 1, + search_boxes_loop => \@search_boxes_array); -# use the global setting by default - if ( C4::Context->preference("expandedSearchOption") == 1 ) { - $template->param( expanded_options => C4::Context->preference("expandedSearchOption") ); - } - # but let the user override it - 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')); - } + # use the global setting by default + if ( C4::Context->preference("expandedSearchOption") == 1 ) { + $template->param( expanded_options => C4::Context->preference("expandedSearchOption") ); + } + # but let the user override it + 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; } @@ -273,6 +307,19 @@ my $params = $cgi->Vars; my $tag; $tag = $params->{tag} if $params->{tag}; + +# String with params with the search criteria for the paging in opac-detail +my $pasarParams = ''; +my $j = 0; +for (keys %$params) { + my @pasarParam = split("\0", $params->{$_}); + for my $paramValue(@pasarParam) { + $pasarParams .= '&' if ($j > 0); + $pasarParams .= $_ . '=' . $paramValue; + $j++; + } +} + # Params that can have more than one value # sort by is used to sort the query # in theory can have more than one but generally there's just one @@ -374,10 +421,10 @@ my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_ my @results; ## I. BUILD THE QUERY -my $lang = C4::Output::getlanguagecookie($cgi); +my $lang = C4::Templates::getlanguage($cgi, 'opac'); ( $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 ($) { +sub _input_cgi_parse { my @elements; for my $this_cgi ( split('&',shift) ) { next unless $this_cgi; @@ -406,6 +453,7 @@ if (C4::Context->preference('OpacSuppression')) { } $template->param ( LIMIT_INPUTS => \@limit_inputs ); +$template->param ( OPACResultsSidebar => C4::Context->preference('OPACResultsSidebar')); ## II. DO THE SEARCH AND GET THE RESULTS my $total = 0; # the total results for the whole set @@ -415,15 +463,15 @@ 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); - my @marclist = (map {$_->{marc}} @biblist ); - $DEBUG and printf STDERR "taglist (%s biblionumber)\nmarclist (%s records)\n", scalar(@$taglist), scalar(@marclist); - $results_hashref->{biblioserver}->{RECORDS} = \@marclist; - # FIXME: tag search and standard search should work together, not exclusively - # FIXME: No facets for tags search. + $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); + my @marclist = (map {$_->{marc}} @biblist ); + $DEBUG and printf STDERR "taglist (%s biblionumber)\nmarclist (%s records)\n", scalar(@$taglist), scalar(@marclist); + $results_hashref->{biblioserver}->{RECORDS} = \@marclist; + # FIXME: tag search and standard search should work together, not exclusively + # FIXME: No facets for tags search. } elsif (C4::Context->preference('NoZebra')) { eval { @@ -434,8 +482,12 @@ elsif (C4::Context->preference('NoZebra')) { ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan); }; } else { + $pasarParams .= '&query=' . $query; + $pasarParams .= '&count=' . $results_per_page; + $pasarParams .= '&simple_query=' . $simple_query; + $pasarParams .= '&query_type=' . $query_type if ($query_type); eval { - ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan); + ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan); }; } # This sorts the facets into alphabetical order @@ -468,82 +520,126 @@ 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( 'opac', $query_desc, $group->{'group_count'},$results_per_page, 0, $scan, - @{ $group->{"RECORDS"} }, C4::Context->preference('hidelostitems')); + $group->{"RECORDS"}); push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results }; } } else { @newresults = searchResults('opac', $query_desc, $hits, $results_per_page, $offset, $scan, - @{$results_hashref->{$server}->{"RECORDS"}},, C4::Context->preference('hidelostitems')); + $results_hashref->{$server}->{"RECORDS"}); } - my $tag_quantity; - if (C4::Context->preference('TagsEnabled') and - $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 }); - } - } - if (C4::Context->preference('COinSinOPACResults')) { - foreach (@newresults) { - $_->{coins} = GetCOinSBiblio($_->{'biblionumber'}); - } + + # must define a value for size if not present in DB + # in order to avoid problems generated by the default size value in TT + foreach my $line (@newresults) { + if ( not exists $line->{'size'} ) { $line->{'size'} = "" } + # while we're checking each line, see if item is in the cart + if ( grep {$_ eq $line->{'biblionumber'}} @cart_list) { + $line->{'incart'} = 1; + } + } + + + my $tag_quantity; + if (C4::Context->preference('TagsEnabled') and + $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 }); + } + } + + if (C4::Context->preference('COinSinOPACResults')) { + foreach (@newresults) { + my $record = GetMarcBiblio($_->{'biblionumber'}); + $_->{coins} = GetCOinSBiblio($record); + if ( C4::Context->preference( "Babeltheque" ) and $_->{normalized_isbn} ) { + my $isbn = Business::ISBN->new( $_->{normalized_isbn} ); + next if not $isbn; + $isbn = $isbn->as_isbn13->as_string; + $isbn =~ s/-//g; + my $social_datas = C4::SocialData::get_data( $isbn ); + next if not $social_datas; + for my $key ( keys %$social_datas ) { + $_->{$key} = $$social_datas{$key}; + if ( $key eq 'score_avg' ){ + $_->{score_int} = sprintf("%.0f", $$social_datas{score_avg} ); + } + } } - - if ($results_hashref->{$server}->{"hits"}){ - $total = $total + $results_hashref->{$server}->{"hits"}; - } - # 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 || $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); - } - - shift @recentSearches if (@recentSearches > 15); - # 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 ( C4::Context->preference('OpacStarRatings') eq 'all' ) { + foreach my $res (@newresults) { + my $rating = GetRating( $res->{'biblionumber'}, $borrowernumber ); + $res->{'rating_value'} = $rating->{'rating_value'}; + $res->{'rating_total'} = $rating->{'rating_total'}; + $res->{'rating_avg'} = $rating->{'rating_avg'}; + $res->{'rating_avg_int'} = $rating->{'rating_avg_int'}; + } + } + + if ($results_hashref->{$server}->{"hits"}){ + $total = $total + $results_hashref->{$server}->{"hits"}; + } + + # 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 + my $path_info = $cgi->url(-path_info=>1); + $query_cgi = $cgi->url(-query=>1); + $query_cgi =~ s/^$path_info\?//; + $query_cgi =~ s/;/&/g; + $query_desc .= ", $limit_desc"; + + if (!$borrowernumber || $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); + } + + shift @recentSearches if (@recentSearches > 15); + # 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 && $format ne 'rss2' - && $format ne 'opensearchdescription' && $format ne 'atom') { + && $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"); @@ -555,6 +651,24 @@ for (my $i=0;$i<@servers;$i++) { exit; } if ($hits) { + if (!C4::Context->preference('NoZebra') && !$build_grouped_results) { + # We build the encrypted list of first OPACnumSearchResults biblios to pass with the search criteria for paging on opac-detail + $pasarParams .= '&listBiblios='; + my $j = 0; + foreach (@newresults) { + my $bibnum = ($_->{biblionumber})?$_->{biblionumber}:0; + $pasarParams .= $bibnum . ','; + $j++; + last if ($j == $results_per_page); + } + chop $pasarParams if ($pasarParams =~ /,$/); + $pasarParams .= '&total=' . int($total) if ($pasarParams !~ /total=(?:[0-9]+)?/); + if ($pasarParams) { + my $session = get_session($cgi->cookie("CGISESSID")); + $session->param('busc' => $pasarParams); + } + # + } $template->param(total => $hits); my $limit_cgi_not_availablity = $limit_cgi; $limit_cgi_not_availablity =~ s/&limit=available//g if defined $limit_cgi_not_availablity; @@ -571,9 +685,17 @@ for (my $i=0;$i<@servers;$i++) { } $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; $template->param(results_per_page => $results_per_page); - $template->param(SEARCH_RESULTS => \@newresults, - OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay") eq "itemdetails"?1:0), + my $hide = C4::Context->preference('OpacHiddenItems'); + $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines + $template->param( + SEARCH_RESULTS => \@newresults, + OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay") eq "itemdetails"?1:0), + suppress_result_number => $hide, ); + if (C4::Context->preference("OPACLocalCoverImages")){ + $template->param(OPACLocalCoverImages => 1); + $template->param(OPACLocalCoverImagesPriority => C4::Context->preference("OPACLocalCoverImagesPriority")); + } ## Build the page numbers on the bottom of the page my @page_numbers; # total number of pages there will be @@ -630,10 +752,16 @@ for (my $i=0;$i<@servers;$i++) { $template->param( PAGE_NUMBERS => \@page_numbers, previous_page_offset => $previous_page_offset) unless $pages < 2; $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number; - } + } # no hits else { - $template->param(searchdesc => 1,query_desc => $query_desc,limit_desc => $limit_desc); + $template->param( + searchdesc => 1, + query_desc => $query_desc, + limit_desc => $limit_desc, + query_cgi => $query_cgi, + limit_cgi => $limit_cgi + ); } } # end of the if local # asynchronously search the authority server @@ -661,7 +789,7 @@ $template->param( total => $total, opacfacets => 1, facets_loop => $facets, - displayFacetCount=> C4::Context->preference('displayFacetCount')||0, + displayFacetCount=> C4::Context->preference('displayFacetCount')||0, scan => $scan, search_error => $error, ); @@ -672,24 +800,14 @@ if ($query_desc || $limit_desc) { # VI. BUILD THE TEMPLATE # Build drop-down list for 'Add To:' menu... -my $session = get_session($cgi->cookie("CGISESSID")); -my @addpubshelves; -my $pubshelves = $session->param('pubshelves'); -my $barshelves = $session->param('barshelves'); -foreach my $shelf (@$pubshelves) { - next if ( ($shelf->{'owner'} != ($borrowernumber ? $borrowernumber : -1)) && ($shelf->{'category'} < 3) ); - push (@addpubshelves, $shelf); -} - -if (@addpubshelves) { - $template->param( addpubshelves => scalar (@addpubshelves)); - $template->param( addpubshelvesloop => \@addpubshelves); -} - -if (defined $barshelves) { - $template->param( addbarshelves => scalar (@$barshelves)); - $template->param( addbarshelvesloop => $barshelves); -} +my ($totalref, $pubshelves, $barshelves)= + C4::VirtualShelves::GetSomeShelfNames($borrowernumber,'COMBO',1); +$template->param( + addbarshelves => $totalref->{bartotal}, + addbarshelvesloop => $barshelves, + addpubshelves => $totalref->{pubtotal}, + addpubshelvesloop => $pubshelves, + ); my $content_type = ($format eq 'rss' or $format eq 'atom') ? $format : 'html'; @@ -698,4 +816,5 @@ if (C4::Context->preference('GoogleIndicTransliteration')) { $template->param('GoogleIndicTransliteration' => 1); } + $template->param( borrowernumber => $borrowernumber); output_with_http_headers $cgi, $cookie, $template->output, $content_type;