use Data::Dumper; # TODO remove
-use Koha::SearchEngine::Elasticsearch::QueryBuilder;
-use Koha::ElasticSearch::Search;
-use Koha::SearchEngine::Zebra::QueryBuilder;
-use Koha::SearchEngine::Zebra::Search;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
my $searchengine = C4::Context->preference("SearchEngine");
my ($builder, $searcher);
#$searchengine = 'Zebra'; # XXX
-for ( $searchengine ) {
- when ( /^Solr$/ ) {
- warn "We use Solr";
- require 'opac/search.pl';
- exit;
- }
- when ( /^Zebra$/ ) {
- $builder=Koha::SearchEngine::Zebra::QueryBuilder->new();
- $searcher=Koha::SearchEngine::Zebra::Search->new();
- }
- when (/^Elasticsearch$/) {
- # Should use the base QueryBuilder, but I don't have it wired up
- # for moose yet.
- $builder=Koha::SearchEngine::Elasticsearch::QueryBuilder->new();
-# $builder=Koha::SearchEngine::Zebra::QueryBuilder->new();
- $searcher=Koha::ElasticSearch::Search->new({index => 'biblios'});
- }
-}
+$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::Biblio; # GetBiblioData
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::Ratings;
+use Koha::Virtualshelves;
use POSIX qw(ceil floor strftime);
use URI::Escape;
# 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');
}
}
-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 );
# 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'));
}
}
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);
}
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 ) {
$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");
# 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
$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);
}
# 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;
my @results;
## 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);
+( $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 });
sub _input_cgi_parse {
my @elements;
# 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 .= '&simple_query=' . uri_escape_utf8($simple_query);
$pasarParams .= '&query_type=' . uri_escape_utf8($query_type) if ($query_type);
eval {
- ($error, $results_hashref, $facets) = $searcher->search_compat($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$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,$query_type,$scan,1);
};
}
-# This sorts the facets into alphabetical order
-if ($facets && @$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;
-}
-
# use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref);
if ($@ || $error) {
$template->param(query_error => $error.$@);
}
}
+ $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;
}
}
||
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 ) {
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 {
projects / koha_ffzg / blobdiff