I'll try to flesh out this section to better explain.
This query incorporates query profiles that aren't compatible with most non-Zebra
-Z39.50 targets to acomplish the field weighting and relevance ranking.
+Z39.50 targets to accomplish the field weighting and relevance ranking.
=item 2 $simple_query - a simple query that doesn't contain the field weighting,
stemming, etc., suitable to pass off to other search targets
use Koha::SearchEngine::Search;
use Koha::SearchEngine::QueryBuilder;
use Koha::Virtualshelves;
+use Koha::SearchFields;
use URI::Escape;
);
}
+if($cgi->cookie("holdforclub")){
+ my $holdfor_club = Koha::Clubs->find( $cgi->cookie("holdforclub") );
+ $template->param(
+ holdforclub => $cgi->cookie("holdforclub"),
+ holdforclub_name => $holdfor_club->name,
+ );
+}
+
+if($cgi->cookie("searchToOrder")){
+ my ( $basketno, $vendorid ) = split( /\//, $cgi->cookie("searchToOrder") );
+ $template->param(
+ searchtoorder_basketno => $basketno,
+ searchtoorder_vendorid => $vendorid
+ );
+}
+
# get biblionumbers stored in the cart
my @cart_list;
);
# load the Type stuff
-my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
-# the index parameter is different for item-level itemtypes
-my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
-my @advancedsearchesloop;
-my $cnt;
-my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes") || "itemtypes";
-my @advanced_search_types = split(/\|/, $advanced_search_types);
-
-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 ) {
- my %row =( number=>$cnt++,
- ccl => "$itype_or_itemtype,phr",
- code => $thisitemtype,
- description => $itemtypes->{$thisitemtype}->{translated_description},
- imageurl=> getitemtypeimagelocation( 'intranet', $itemtypes->{$thisitemtype}->{'imageurl'} ),
- );
- push @itypesloop, \%row;
- }
- 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);
- my @authvalueloop;
- for my $thisitemtype (@$advsearchtypes) {
- my %row =(
- number=>$cnt++,
- ccl => $advanced_srch_type,
- code => $thisitemtype->{authorised_value},
- description => $thisitemtype->{'lib'},
- imageurl => getitemtypeimagelocation( 'intranet', $thisitemtype->{'imageurl'} ),
- );
- push @authvalueloop, \%row;
- }
- my %search_code = ( advanced_search_type => $advanced_srch_type,
- code_loop => \@authvalueloop );
- push @advancedsearchesloop, \%search_code;
- }
-}
-$template->param(advancedsearchesloop => \@advancedsearchesloop);
my $types = C4::Context->preference("AdvancedSearchTypes") || "itemtypes";
my $advancedsearchesloop = prepare_adv_search_types($types);
$template->param(advancedsearchesloop => $advancedsearchesloop);
$template->param(outer_sup_servers_loop => $secondary_servers_loop,);
# set the default sorting
- if ( C4::Context->preference('OPACdefaultSortField')
- && C4::Context->preference('OPACdefaultSortOrder') ) {
+ if ( C4::Context->preference('defaultSortField')
+ && C4::Context->preference('defaultSortOrder') ) {
my $default_sort_by =
C4::Context->preference('defaultSortField') . '_'
. C4::Context->preference('defaultSortOrder');
# 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
# FIXME: all this junk can be done in TMPL using __first__ and __last__
for (my $i=1;$i<=$search_boxes_count;$i++) {
# if it's the first one, don't display boolean option, but show scan indexes
# * we can edit the values by changing the key
# * multivalued CGI paramaters are returned as a packaged string separated by "\0" (null)
my $params = $cgi->Vars;
-
# 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
# if a simple index (only one) display the index used in the top search box
if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
my $idx = "ms_".$indexes[0];
- $idx =~ s/\,/comma/g; # template toolkit doesnt like variables with a , in it
+ $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);
}
# 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
+if ($operands[0] && !$operands[1]) {
+ my $ms_query = $operands[0];
+ $ms_query =~ s/ #\S+//;
+ $template->param(ms_value => $ms_query);
+}
+
# limits are use to limit to results to a pre-defined category such as branch or language
my @limits = map uri_unescape($_), $cgi->multi_param('limit');
my @nolimits = map uri_unescape($_), $cgi->multi_param('nolimit');
if($params->{'multibranchlimit'}) {
my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
my @libraries = $search_group->all_libraries;
- my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')';
+ my $multibranch = '('.join( " OR ", map { '(homebranch: ' . $_->branchcode .')' } @libraries ) .')';
push @limits, $multibranch if ($multibranch ne '()');
}
my $count = C4::Context->preference('numSearchResults') || 20;
my $results_per_page = $params->{'count'} || $count;
my $offset = $params->{'offset'} || 0;
+my $whole_record = $params->{'whole_record'} || 0;
$offset = 0 if $offset < 0;
my $page = $cgi->param('page') || 1;
#my $offset = ($page-1)*$results_per_page;
-my $expanded_facet = $params->{'expand'};
# Define some global variables
my ( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$query_type);
$query_type
)
= $builder->build_query_compat( \@operators, \@operands, \@indexes, \@limits,
- \@sort_by, $scan, $lang );
+ \@sort_by, $scan, $lang, { weighted_fields => !$cgi->param('advsearch'), whole_record => $whole_record });
+
+$template->param( search_query => $query ) if C4::Context->preference('DumpSearchQueryTemplate');
## parse the query_cgi string and put it into a form suitable for <input>s
my @query_inputs;
my $input_value = $2;
push @query_inputs, { input_name => $input_name, input_value => Encode::decode_utf8( uri_unescape( $input_value ) ) };
if ($input_name eq 'idx') {
- $scan_index_to_use = $input_value; # unless $scan_index_to_use;
+ # The form contains multiple fields, so take the first value as the scan index
+ $scan_index_to_use = $input_value unless $scan_index_to_use;
}
- if ($input_name eq 'q') {
+ if (!defined $scan_search_term_to_use && $input_name eq 'q') {
$scan_search_term_to_use = Encode::decode_utf8( uri_unescape( $input_value ));
}
}
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
( $error, $results_hashref, $facets ) = $searcher->search_compat(
$query, $simple_query, \@sort_by, \@servers,
- $results_per_page, $offset, $expanded_facet, undef,
- $itemtypes, $query_type, $scan
+ $results_per_page, $offset, undef, $itemtypes,
+ $query_type, $scan
);
};
if ($server =~/biblioserver/) { # this is the local bibliographic server
my $hits = $results_hashref->{$server}->{"hits"} // 0;
my $page = $cgi->param('page') || 0;
- my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan,
+ my @newresults = searchResults({ 'interface' => 'intranet' }, $query_desc, $hits, $results_per_page, $offset, $scan,
$results_hashref->{$server}->{"RECORDS"});
$total = $total + $hits;
$template->param( EnableSearchHistory => 1 );
}
- ## If there's just one result, redirect to the detail page
- if ($total == 1) {
+ ## If there's just one result, redirect to the detail page unless doing an index scan
+ if ($total == 1 && !$scan) {
my $biblionumber = $newresults[0]->{biblionumber};
my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
my $views = { C4::Search::enabled_staff_search_views };
## FIXME: add a global function for this, it's better than the current global one
## Build the page numbers on the bottom of the page
my @page_numbers;
- my $hits_to_paginate = C4::Context->preference('SearchEngine') eq 'Elasticsearch' ? 10000 : $hits;
+ 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_to_paginate / $results_per_page);
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;
- warn "topage $hits_to_paginate";
}
projects / koha-ffzg.git / blobdiff