X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-search.pl;h=1d7615bc5cffdd55b9e91499f12582c6e9624295;hb=4ec5a67c6f989635b14f048c3720bea7a8d86d38;hp=72d054f5124c5d608a80f015150ed11bbfbfbc32;hpb=3b8f35de7924c48d8d6290b114bcb71f39453d48;p=koha.git diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 72d054f512..1d7615bc5c 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -30,20 +30,32 @@ use Modern::Perl; use C4::Context; use List::MoreUtils q/any/; +use Data::Dumper; # TODO remove + +use Koha::SearchEngine::Search; +use Koha::SearchEngine::QueryBuilder; + +my $searchengine = C4::Context->preference("SearchEngine"); +my ($builder, $searcher); +#$searchengine = 'Zebra'; # XXX +$builder = Koha::SearchEngine::QueryBuilder->new({index => 'biblios'}); +$searcher = Koha::SearchEngine::Search->new({index => 'biblios'}); + use C4::Output; use C4::Auth qw(:DEFAULT get_session); use C4::Languages qw(getLanguages); use C4::Search; use C4::Search::History; -use C4::Biblio; # GetBiblioData +use C4::Biblio; # Unused here? use C4::Koha; use C4::Tags qw(get_tags); -use C4::Branch; # GetBranches use C4::SocialData; -use C4::Ratings; use C4::External::OverDrive; -use Koha::LibraryCategories; +use Koha::ItemTypes; +use Koha::Ratings; +use Koha::Virtualshelves; +use Koha::Library::Groups; use POSIX qw(ceil floor strftime); use URI::Escape; @@ -85,8 +97,8 @@ my ($template,$borrowernumber,$cookie); # decide which template to use my $template_name; my $template_type = 'basic'; -my @params = $cgi->param("limit"); -my @searchCategories = $cgi->param('searchcat'); +my @params = $cgi->multi_param("limit"); +my @searchCategories = $cgi->multi_param('searchcat'); my $format = $cgi->param("format") || ''; my $build_grouped_results = C4::Context->preference('OPACGroupResults'); @@ -96,7 +108,7 @@ if ($format =~ /(rss|atom|opensearchdescription)/) { elsif (@params && $build_grouped_results) { $template_name = 'opac-results-grouped.tt'; } -elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) ) { +elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) || @searchCategories ) { $template_name = 'opac-results.tt'; } else { @@ -202,9 +214,8 @@ if ($cgi->cookie("search_path_code")) { } } -my $branches = GetBranches(); # used later in *getRecords, probably should be internalized by those functions after caching in C4::Branch is established -my $library_categories = Koha::LibraryCategories->search( { categorytype => 'searchdomain' }, { order_by => [ 'categorytype', 'categorycode' ] } ); -$template->param( searchdomainloop => $library_categories ); +my @search_groups = Koha::Library::Groups->get_search_groups(); +$template->param( search_groups => \@search_groups ); # load the language limits (for search) my $languages_limit_loop = getLanguages($lang, 1); @@ -214,13 +225,14 @@ $template->param(search_languages_loop => $languages_limit_loop,); my $itemtypes = GetItemTypesCategorized; # add translated_description to itemtypes foreach my $itemtype ( keys %{$itemtypes} ) { - # Itemtypes search categories don't have (yet) translated descriptions, they are auth values - my $translated_description = getitemtypeinfo( $itemtype, 'opac' )->{translated_description}; - $itemtypes->{$itemtype}->{translated_description} = - ( $translated_description ) ? $translated_description : $itemtypes->{$itemtype}->{description}; + # Itemtypes search categories don't have (yet) translated descriptions, they are auth values (and could still have no descriptions too BZ 18400) + # If 'iscat' (see ITEMTYPECAT) then there is no itemtype and the description is not translated + my $translated_description = $itemtypes->{$itemtype}->{iscat} + ? $itemtypes->{$itemtype}->{description} + : Koha::ItemTypes->find($itemtype)->translated_description; + $itemtypes->{$itemtype}->{translated_description} = $translated_description || $itemtypes->{$itemtype}->{description} || q{}; } -# Load the Type stuff without search categories for facets -my $itemtypes_nocategory = GetItemTypes; + # the index parameter is different for item-level itemtypes my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; my @advancedsearchesloop; @@ -240,13 +252,14 @@ if ( $yaml =~ /\S/ ) { } } +my @sorted_itemtypes = sort { $itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->{translated_description} } keys %$itemtypes; foreach my $advanced_srch_type (@advanced_search_types) { $advanced_srch_type =~ s/^\s*//; $advanced_srch_type =~ s/\s*$//; 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}->{translated_description} cmp $itemtypes->{$b}->{translated_description} } keys %$itemtypes ) { + foreach my $thisitemtype ( @sorted_itemtypes ) { next if $hidingrules->{itype} && any { $_ eq $thisitemtype } @{$hidingrules->{itype}}; next if $hidingrules->{itemtype} && any { $_ eq $thisitemtype } @{$hidingrules->{itemtype}}; my %row =( number=>$cnt++, @@ -267,7 +280,7 @@ foreach my $advanced_srch_type (@advanced_search_types) { push @advancedsearchesloop, \%search_code; } else { # covers all the other cases: non-itemtype authorized values - my $advsearchtypes = GetAuthorisedValues($advanced_srch_type, '', 'opac'); + my $advsearchtypes = GetAuthorisedValues($advanced_srch_type, 'opac'); my @authvalueloop; for my $thisitemtype (@$advsearchtypes) { my $hiding_key = lc $thisitemtype->{category}; @@ -363,13 +376,10 @@ if ( $template_type && $template_type eq 'advsearch' ) { # 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')); + $template->param( expanded_options => scalar $cgi->param('expanded_options')); } } - if (C4::Context->preference('OPACNumbersPreferPhrase')) { - $template->param('numbersphr' => 1); - } output_html_with_http_headers $cgi, $cookie, $template->output; exit; @@ -393,7 +403,7 @@ if ( $params->{tag} ) { my $pasarParams = ''; my $j = 0; for (keys %$params) { - my @pasarParam = $cgi->param($_); + my @pasarParam = $cgi->multi_param($_); for my $paramValue(@pasarParam) { $pasarParams .= '&' if ($j > 0); $pasarParams .= $_ . '=' . uri_escape_utf8($paramValue); @@ -414,7 +424,7 @@ if ( C4::Context->preference('OPACdefaultSortField') } my @allowed_sortby = qw /acqdate_asc acqdate_dsc author_az author_za call_number_asc call_number_dsc popularity_asc popularity_dsc pubdate_asc pubdate_dsc relevance title_az title_za/; -@sort_by = $cgi->param('sort_by'); +@sort_by = $cgi->multi_param('sort_by'); $sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by); foreach my $sort (@sort_by) { if ( grep { /^$sort$/ } @allowed_sortby ) { @@ -424,7 +434,7 @@ foreach my $sort (@sort_by) { $template->param('sort_by' => $sort_by[0]); # Use the servers defined, or just search our local catalog(default) -my @servers = $cgi->param('server'); +my @servers = $cgi->multi_param('server'); unless (@servers) { #FIXME: this should be handled using Context.pm @servers = ("biblioserver"); @@ -433,12 +443,12 @@ unless (@servers) { # operators include boolean and proximity operators and are used # to evaluate multiple operands -my @operators = $cgi->param('op'); +my @operators = $cgi->multi_param('op'); @operators = map { uri_unescape($_) } @operators; # indexes are query qualifiers, like 'title', 'author', etc. They # can be single or multiple parameters separated by comma: kw,right-Truncation -my @indexes = $cgi->param('idx'); +my @indexes = $cgi->multi_param('idx'); @indexes = map { uri_unescape($_) } @indexes; # if a simple index (only one) display the index used in the top search box @@ -446,7 +456,7 @@ if ($indexes[0] && !$indexes[1]) { $template->param("ms_".$indexes[0] => 1); } # an operand can be a single term, a phrase, or a complete ccl query -my @operands = $cgi->param('q'); +my @operands = $cgi->multi_param('q'); @operands = map { uri_unescape($_) } @operands; $template->{VARS}->{querystring} = join(' ', @operands); @@ -459,9 +469,9 @@ if ($operands[0] && !$operands[1]) { } # limits are use to limit to results to a pre-defined category such as branch or language -my @limits = $cgi->param('limit'); +my @limits = $cgi->multi_param('limit'); @limits = map { uri_unescape($_) } @limits; -my @nolimits = $cgi->param('nolimit'); +my @nolimits = $cgi->multi_param('nolimit'); @nolimits = map { uri_unescape($_) } @nolimits; my %is_nolimit = map { $_ => 1 } @nolimits; @limits = grep { not $is_nolimit{$_} } @limits; @@ -469,7 +479,8 @@ my %is_nolimit = map { $_ => 1 } @nolimits; if (@searchCategories > 0) { my @tabcat; foreach my $typecategory (@searchCategories) { - push (@tabcat, GetItemTypesByCategory($typecategory)); + my @itemtypes = Koha::ItemTypes->search({ searchcategory => $typecategory }); + push @tabcat, $_->itemtype for @itemtypes; } foreach my $itemtypeInCategory (@tabcat) { @@ -480,9 +491,9 @@ if (@searchCategories > 0) { @limits = map { uri_unescape($_) } @limits; if($params->{'multibranchlimit'}) { - my $library_category = Koha::LibraryCategories->find( $params->{multibranchlimit} ); - my @libraries = $library_category->libraries; - my $multibranch = '('.join( " or ", map { 'branch: ' . $_->id } @libraries ) .')'; + my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} ); + my @libraries = $search_group->all_libraries; + my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')'; push @limits, $multibranch if ($multibranch ne '()'); } @@ -496,11 +507,7 @@ $template->param(available => $available); # append year limits if they exist if ($params->{'limit-yr'}) { - if ($params->{'limit-yr'} =~ /\d{4}-\d{4}/) { - my ($yr1,$yr2) = split(/-/, $params->{'limit-yr'}); - push @limits, "yr,st-numeric,ge=$yr1 and yr,st-numeric,le=$yr2"; - } - elsif ($params->{'limit-yr'} =~ /\d{4}/) { + if ($params->{'limit-yr'} =~ /\d{4}/) { push @limits, "yr,st-numeric=$params->{'limit-yr'}"; } else { @@ -514,6 +521,7 @@ my $count = C4::Context->preference('OPACnumSearchResults') || 20; my $countRSS = C4::Context->preference('numSearchRSSResults') || 50; my $results_per_page = $params->{'count'} || $count; my $offset = $params->{'offset'} || 0; +$offset = 0 if $offset < 0; my $page = $cgi->param('page') || 1; $offset = ($page-1)*$results_per_page if $page>1; my $hits; @@ -524,8 +532,31 @@ my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_ my @results; +my $suppress = 0; +if (C4::Context->preference('OpacSuppression')) { + # OPAC suppression by IP address + if (C4::Context->preference('OpacSuppressionByIPRange')) { + my $IPAddress = $ENV{'REMOTE_ADDR'}; + my $IPRange = C4::Context->preference('OpacSuppressionByIPRange'); + $suppress = ($IPAddress !~ /^$IPRange/); + } + else { + $suppress = 1; + } +} + ## I. BUILD THE QUERY -( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang); +( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$query_type) + = $builder->build_query_compat( + \@operators, + \@operands, + \@indexes, + \@limits, + \@sort_by, + 0, + $lang, + { expanded_facet => $expanded_facet, suppress => $suppress } + ); sub _input_cgi_parse { my @elements; @@ -545,36 +576,6 @@ $template->param ( QUERY_INPUTS => \@query_inputs ); ## parse the limit_cgi string and put it into a form suitable for s 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='') )"; -#} -# -# add OPAC suppression - requires at least one item indexed with Suppress -if (C4::Context->preference('OpacSuppression')) { - # OPAC suppression by IP address - if (C4::Context->preference('OpacSuppressionByIPRange')) { - my $IPAddress = $ENV{'REMOTE_ADDR'}; - my $IPRange = C4::Context->preference('OpacSuppressionByIPRange'); - if ($IPAddress !~ /^$IPRange/) { - if ( $query_type eq 'pqf' ) { - $query = '@not '.$query.' @attr 14=1 @attr 1=9011 1'; - } else { - $query = "($query) not Suppress=1"; - } - } - } - else { - if ( $query_type eq 'pqf' ) { - #$query = "($query) && -(suppress:1)"; #QP syntax - $query = '@not '.$query.' @attr 14=1 @attr 1=9011 1'; #PQF syntax - } else { - $query = "($query) not Suppress=1"; - } - } -} - $template->param ( LIMIT_INPUTS => \@limit_inputs ); $template->param ( OPACResultsSidebar => C4::Context->preference('OPACResultsSidebar')); @@ -589,35 +590,28 @@ 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 { (C4::Context->config('zebra_bib_index_mode') eq 'dom')? $_->{marcxml}: $_->{marc}; } @biblist); + my @marclist = map { C4::Biblio::GetXmlBiblio( $_->{biblionumber} ) } @$taglist; $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 ($build_grouped_results) { eval { - ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan); + ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,undef,$query_type,$scan); }; } else { $pasarParams .= '&query=' . uri_escape_utf8($query); $pasarParams .= '&count=' . uri_escape_utf8($results_per_page); $pasarParams .= '&simple_query=' . uri_escape_utf8($simple_query); $pasarParams .= '&query_type=' . uri_escape_utf8($query_type) if ($query_type); + my $itemtypes_nocategory = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; eval { - ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes_nocategory,$query_type,$scan,1); - }; -} -# This sorts the facets into alphabetical order -if ($facets) { - foreach my $f (@$facets) { - $f->{facets} = [ sort { uc($a->{facet_label_value}) cmp uc($b->{facet_label_value}) } @{ $f->{facets} } ]; - } - @$facets = sort {$a->{expand} cmp $b->{expand}} @$facets; + ($error, $results_hashref, $facets) = $searcher->search_compat($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,undef,$itemtypes_nocategory,$query_type,$scan,1); +}; } # use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref); -if ($@ || $error) { +if (not $tag and ( $@ || $error)) { $template->param(query_error => $error.$@); output_html_with_http_headers $cgi, $cookie, $template->output; exit; @@ -658,7 +652,7 @@ for (my $i=0;$i<@servers;$i++) { } if (C4::Context->preference('COinSinOPACResults')) { - my $record = GetMarcBiblio($res->{'biblionumber'}); + my $record = GetMarcBiblio({ biblionumber => $res->{'biblionumber'} }); $res->{coins} = GetCOinSBiblio($record); } if ( C4::Context->preference( "Babeltheque" ) and $res->{normalized_isbn} ) { @@ -690,12 +684,17 @@ for (my $i=0;$i<@servers;$i++) { } } + $res->{shelves} = Koha::Virtualshelves->get_shelves_containing_record( + { + biblionumber => $res->{biblionumber}, + borrowernumber => $borrowernumber + } + ); + if ( C4::Context->preference('OpacStarRatings') eq 'all' ) { - 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'}; + my $ratings = Koha::Ratings->search({ biblionumber => $res->{biblionumber} }); + $res->{ratings} = $ratings; + $res->{my_rating} = $borrowernumber ? $ratings->search({ borrowernumber => $borrowernumber })->next : undef; } } @@ -794,12 +793,12 @@ for (my $i=0;$i<@servers;$i++) { || C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - my $branchname; + my $branchcode; if ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) { - $branchname = $branches->{$branch}->{'branchname'}; + $branchcode = $branch; } elsif ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - $branchname = $branches->{ $ENV{'BRANCHCODE'} }->{'branchname'}; + $branchcode = $ENV{'BRANCHCODE'}; } foreach my $res ( @newresults ) { @@ -807,7 +806,7 @@ for (my $i=0;$i<@servers;$i++) { my @top_loop; my @old_loop = @{$res->{'available_items_loop'}}; foreach my $item ( @old_loop ) { - if ( $item->{'branchname'} eq $branchname ) { + if ( $item->{'branchcode'} eq $branchcode ) { $item->{'this_branch'} = 1; push( @top_loop, $item ); } else { @@ -833,6 +832,7 @@ for (my $i=0;$i<@servers;$i++) { my @page_numbers; # total number of pages there will be my $pages = ceil($hits / $results_per_page); + my $last_page_offset = ( $pages - 1 ) * $results_per_page; # default page number my $current_page_number = 1; if ($offset) { @@ -883,6 +883,7 @@ for (my $i=0;$i<@servers;$i++) { } $template->param( PAGE_NUMBERS => \@page_numbers, + last_page_offset => $last_page_offset, previous_page_offset => $previous_page_offset) unless $pages < 2; $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number; }