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::SocialData;
use C4::External::OverDrive;
-use Koha::LibraryCategories;
+use Koha::Libraries;
+use Koha::ItemTypes;
use Koha::Ratings;
use Koha::Virtualshelves;
+use Koha::Library::Groups;
+use Koha::Patrons;
+use Koha::SearchFields;
use POSIX qw(ceil floor strftime);
use URI::Escape;
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 {
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
}
);
+my $patron = Koha::Patrons->find( $borrowernumber );
my $lang = C4::Languages::getlanguage($cgi);
}
}
-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);
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;
}
}
+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++,
# shouldn't appear on the first one, scan indexes should, adding a new
# box should only appear on the last, etc.
my @search_boxes_array;
- my $search_boxes_count = 3; # begin whith 3 boxes
+ my $search_boxes_count = 3; # begin with 3 boxes
$template->param( search_boxes_count => $search_boxes_count );
if ($cgi->cookie("num_paragraph")){
}
}
- if (C4::Context->preference('OPACNumbersPreferPhrase')) {
- $template->param('numbersphr' => 1);
- }
output_html_with_http_headers $cgi, $cookie, $template->output;
exit;
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) {
@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 '()');
}
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;
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;
+ }
+}
+
+my $build_params = {
+ expanded_facet => $expanded_facet,
+ suppress => $suppress
+};
+
+unless ( $cgi->param('advsearch') ) {
+ $build_params->{weighted_fields} = 1;
+}
+
## I. BUILD THE QUERY
-( $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 });
+( $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, $build_params);
sub _input_cgi_parse {
my @elements;
## parse the limit_cgi string and put it into a form suitable for <input>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'));
$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: Because search and standard search don't work together OpacHiddenItems
+ # displays search results which should be hidden.
# FIXME: No facets for tags search.
} elsif ($build_grouped_results) {
eval {
$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) = $searcher->search_compat($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,undef,$itemtypes,$query_type,$scan,1);
+ ($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;
# At this point, each server has given us a result set
# now we build that set for template display
my @sup_results_array;
+my $search_context = {};
+$search_context->{'interface'} = 'opac';
+if (C4::Context->preference('OpacHiddenItemsExceptions')){
+ $search_context->{'category'} = $patron ? $patron->categorycode : q{};
+}
+
for (my $i=0;$i<@servers;$i++) {
my $server = $servers[$i];
if ($server && $server =~/biblioserver/) { # this is the local bibliographic server
# 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( 'opac', $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
+ my @group_results = searchResults( $search_context, $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
$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,
+ @newresults = searchResults( $search_context, $query_desc, $hits, $results_per_page, $offset, $scan,
$results_hashref->{$server}->{"RECORDS"});
}
$hits = 0 unless @newresults;
+ my $art_req_itypes;
+ if( C4::Context->preference('ArticleRequests') ) {
+ $art_req_itypes = Koha::IssuingRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () });
+ }
+
foreach my $res (@newresults) {
# must define a value for size if not present in DB
}
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} ) {
$res->{ratings} = $ratings;
$res->{my_rating} = $borrowernumber ? $ratings->search({ borrowernumber => $borrowernumber })->next : undef;
}
+
+ # BZ17530: 'Intelligent' guess if result can be article requested
+ $res->{artreqpossible} = ( $art_req_itypes->{ $res->{itemtype} // q{} } || $art_req_itypes->{ '*' } ) ? 1 : q{};
}
if ($results_hashref->{$server}->{"hits"}){
}
## Build the page numbers on the bottom of the page
my @page_numbers;
+ my $max_result_window = $searcher->max_result_window;
+ my $hits_to_paginate = ($max_result_window && $max_result_window < $hits) ? $max_result_window : $hits;
+ $template->param( hits_to_paginate => $hits_to_paginate );
# total number of pages there will be
- my $pages = ceil($hits / $results_per_page);
+ my $pages = ceil($hits_to_paginate / $results_per_page);
+ my $last_page_offset = ( $pages - 1 ) * $results_per_page;
# default page number
my $current_page_number = 1;
if ($offset) {
}
$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;
}
$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');
$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');
-if ($offset == 0 && IsOverDriveEnabled()) {
- $template->param(OverDriveEnabled => 1);
- $template->param(OverDriveLibraryID => C4::Context->preference('OverDriveLibraryID'));
+if ($offset == 0) {
+ if (IsOverDriveEnabled()) {
+ $template->param(OverDriveEnabled => 1);
+ $template->param(OverDriveLibraryID => C4::Context->preference('OverDriveLibraryID'));
+ }
+ $template->param(RecordedBooksEnabled => C4::Context->preference( 'RecordedBooksClientSecret' ) && C4::Context->preference( 'RecordedBooksLibraryID' ));
}
$template->param( borrowernumber => $borrowernumber);
projects / koha.git / blobdiff