## load Koha modules
use C4::Context;
use C4::Output qw( output_html_with_http_headers pagination_bar );
+use C4::Circulation qw( barcodedecode );
use C4::Auth qw( get_template_and_user );
use C4::Search qw( searchResults enabled_staff_search_views z3950_search_args new_record_from_zebra );
use C4::Languages qw( getlanguage getLanguages );
use Koha::SearchEngine::QueryBuilder;
use Koha::Virtualshelves;
use Koha::SearchFields;
+use Koha::SearchFilters;
use URI::Escape;
+use JSON qw( decode_json encode_json );
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
# create a new CGI object
my %is_nolimit = map { $_ => 1 } @nolimits;
@limits = grep { not $is_nolimit{$_} } @limits;
if (
- !$cgi->param('edit_search') &&
+ !$cgi->param('edit_search') && !$cgi->param('edit_filter') &&
( (@limits>=1) || (defined $cgi->param("q") && $cgi->param("q") ne "" ) || ($cgi->param('limit-yr')) )
) {
$template_name = 'catalogue/results.tt';
my $holdfor_patron = Koha::Patrons->find( $cgi->cookie("holdfor") );
if ( $holdfor_patron ) { # may have been deleted in the meanwhile
$template->param(
- holdfor => $cgi->cookie("holdfor"),
- holdfor_surname => $holdfor_patron->surname,
- holdfor_firstname => $holdfor_patron->firstname,
- holdfor_cardnumber => $holdfor_patron->cardnumber,
+ holdfor => $cgi->cookie("holdfor"),
+ holdfor_patron => $holdfor_patron,
);
}
}
my @search_groups =
Koha::Library::Groups->get_search_groups( { interface => 'staff' } )->as_list;
-@search_groups = sort { $a->title cmp $b->title } @search_groups;
+
+my $branch_limit = '';
+my $limit_param = $cgi->param('limit');
+if ( $limit_param and $limit_param =~ /branch:([\w-]+)/ ) {
+ $branch_limit = $1;
+}
$template->param(
search_groups => \@search_groups,
+ branch_limit => $branch_limit
);
# load the Type stuff
# The following should only be loaded if we're bringing up the advanced search template
if ( $template_type eq 'advsearch' ) {
+ my @operands;
+ my @operators;
+ my @indexes;
my $expanded = $cgi->param('expanded_options');
if( $cgi->param('edit_search') ){
- my @operators = $cgi->multi_param('op');
- my @indexes = $cgi->multi_param('idx');
- my %limit_hash;
- foreach my $limit (@limits){
- if ( $limit eq 'available' ){
- $template->param( limit_available => 1 );
- } else {
- my ($index,$value) = split(':',$limit);
- $value =~ s/"//g;
- if ( $index =~ /mc-/ ){
- $limit_hash{$index . "_" . $value} = 1;
- } else {
- push @{$limit_hash{$index}}, $value;
- }
- }
- };
- $expanded = 1 if scalar @operators || scalar @limits;
- $template->param( operators => \@operators );
- $template->param( limits => \%limit_hash );
+ @operands = $cgi->multi_param('q');
+ @operators = $cgi->multi_param('op');
+ @indexes = $cgi->multi_param('idx');
$template->param(
- indexes => \@indexes,
sort => $cgi->param('sort_by'),
);
+ # determine what to display next to the search boxes
+ } elsif ( $cgi->param('edit_filter') ){
+ my $search_filter = Koha::SearchFilters->find( $cgi->param('edit_filter') );
+ if( $search_filter ){
+ my $query = decode_json( $search_filter->query );
+ my $limits = decode_json( $search_filter->limits );
+ @operands = @{ $query->{operands} };
+ @indexes = @{ $query->{indexes} };
+ @operators = @{ $query->{operators} };
+ @limits = @{ $limits->{limits} };
+ $template->param( edit_filter => $search_filter );
+ } else {
+ $template->param( unknown_filter => 1 );
+ }
+ }
+
+ while( scalar @operands < 3 ){
+ push @operands, "";
}
+ $template->param( operands => \@operands );
+ $template->param( operators => \@operators );
+ $template->param( indexes => \@indexes );
+
+ my %limit_hash;
+ foreach my $limit (@limits){
+ if ( $limit eq 'available' ){
+ $template->param( limit_available => 1 );
+ } else {
+ my ($index,$value) = split(':',$limit);
+ $value =~ s/"//g;
+ if ( $index =~ /mc-/ ){
+ $limit_hash{$index . "_" . $value} = 1;
+ } else {
+ push @{$limit_hash{$index}}, $value;
+ }
+ }
+ };
+ $template->param( limits => \%limit_hash );
+
+ $expanded = 1 if scalar @operators || scalar @limits;
+
# load the servers (used for searching -- to do federated searching, etc.)
my $primary_servers_loop;# = displayPrimaryServers();
$template->param(outer_servers_loop => $primary_servers_loop,);
$template->param( sort_by => $default_sort_by );
}
- # determine what to display next to the search boxes
- my @queries = $cgi->multi_param('q');
- while( scalar @queries < 3 ){
- push @queries, "";
- }
$template->param(uc(C4::Context->preference("marcflavour")) =>1 );
# load the language limits (for search)
my $languages_limit_loop = getLanguages($lang, 1);
$template->param(search_languages_loop => $languages_limit_loop,);
- $template->param( queries => \@queries );
# Expanded search options in advanced search:
# use the global setting by default, but let the user override it
my $idx = "ms_".$indexes[0];
$idx =~ s/\,/comma/g; # template toolkit doesn't like variables with a , in it
$idx =~ s/-/dash/g; # template toolkit doesn't like variables with a dash in it
- $template->param($idx => 1);
+ $template->param(header_pulldown => $idx);
}
# an operand can be a single term, a phrase, or a complete ccl query
my @operands = map uri_unescape($_), $cgi->multi_param('q');
# if a simple search, display the value in the search box
+my $basic_search = 0;
if ($operands[0] && !$operands[1]) {
my $ms_query = $operands[0];
$ms_query =~ s/ #\S+//;
$template->param(ms_value => $ms_query);
+ $basic_search=1;
}
my $available;
my $searcher = Koha::SearchEngine::Search->new(
{ index => $Koha::SearchEngine::BIBLIOS_INDEX } );
+# If index indicates the value is a barocode, we need to preproccess it before searching
+for ( my $i = 0; $i < @operands; $i++ ) {
+ $operands[$i] = barcodedecode($operands[$i]) if $indexes[$i] eq 'bc';
+}
+
## I. BUILD THE QUERY
(
$error, $query, $simple_query, $query_cgi,
## parse the limit_cgi string and put it into a form suitable for <input>s
my @limit_inputs;
+my %active_filters;
if ($limit_cgi) {
for my $this_cgi ( split('&', $limit_cgi) ) {
next unless $this_cgi;
my $input_value = $2;
$input_name =~ s/=$//;
push @limit_inputs, { input_name => $input_name, input_value => Encode::decode_utf8( uri_unescape($input_value) ) };
+ if( $input_value =~ /search_filter/ ){
+ my ($filter_id) = ( uri_unescape($input_value) =~ /^search_filter:(.*)$/ );
+ $active_filters{$filter_id} = 1;
+ }
+
}
}
$template->param ( LIMIT_INPUTS => \@limit_inputs );
my $server = $servers[$i];
if ($server =~/biblioserver/) { # this is the local bibliographic server
my $hits = $results_hashref->{$server}->{"hits"} // 0;
+ if ( $hits == 0 && $basic_search ){
+ $operands[0] = '"'.$operands[0].'"'; #quote it
+ ## 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, $scan, $lang, { weighted_fields => $weight_search, whole_record => $whole_record });
+ my $quoted_results_hashref;
+ eval {
+ my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
+ ( $error, $quoted_results_hashref, $facets ) = $searcher->search_compat(
+ $query, $simple_query, \@sort_by, ['biblioserver'],
+ $results_per_page, $offset, undef, $itemtypes,
+ $query_type, $scan
+ );
+ };
+ my $quoted_hits = $quoted_results_hashref->{$server}->{"hits"} // 0;
+ if ( $quoted_hits ){
+ $results_hashref->{'biblioserver'} = $quoted_results_hashref->{'biblioserver'};
+ $hits = $quoted_hits;
+ }
+ }
my $page = $cgi->param('page') || 0;
my @newresults = searchResults({ 'interface' => 'intranet' }, $query_desc, $hits, $results_per_page, $offset, $scan,
$results_hashref->{$server}->{"RECORDS"});
$template->param (z3950_search_params => C4::Search::z3950_search_args($z3950par || $query_desc));
$template->param(limit_cgi => $limit_cgi);
$template->param(query_cgi => $query_cgi);
+ $template->param(query_json => encode_json({
+ operators => \@operators,
+ operands => \@operands,
+ indexes => \@indexes
+ }));
+ $template->param(limit_json => encode_json({
+ limits => \@limits
+ }));
$template->param(query_desc => $query_desc);
$template->param(limit_desc => $limit_desc);
$template->param(offset => $offset);
+ $template->param(offset => $offset);
+
if ($hits) {
$template->param(total => $hits);
}
}
+
+$template->param(
+ search_filters => Koha::SearchFilters->search({ staff_client => 1 }, { order_by => "name" }),
+ active_filters => \%active_filters,
+) if C4::Context->preference('SavedSearchFilters');
+
$template->param(
#classlist => $classlist,
total => $total,
projects / srvgit / blobdiff