use Modern::Perl;
use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Biblio;
-use C4::Breeding;
-use C4::Output;
-use C4::Koha;
-use C4::Search;
+use C4::Auth qw( get_template_and_user );
+use C4::Breeding qw( BreedingSearch );
+use C4::Output qw( output_html_with_http_headers pagination_bar );
+use C4::Koha qw( getnbpages );
+use C4::Languages;
+use C4::Search qw( searchResults z3950_search_args );
use Koha::BiblioFrameworks;
use Koha::SearchEngine::Search;
use Koha::SearchEngine::QueryBuilder;
use Koha::Z3950Servers;
-my $input = new CGI;
+my $input = CGI->new;
my $success = $input->param('biblioitem');
my $query = $input->param('q');
my @value = $input->multi_param('value');
my $page = $input->param('page') || 1;
my $results_per_page = 20;
+my $lang = C4::Languages::getlanguage($input);
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
template_name => "cataloguing/addbooks.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { editcatalogue => '*' },
- debug => 1,
}
);
# build query
my @operands = $query;
- my $QParser;
- $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
my $builtquery;
+ my $query_cgi;
my $builder = Koha::SearchEngine::QueryBuilder->new(
{ index => $Koha::SearchEngine::BIBLIOS_INDEX } );
my $searcher = Koha::SearchEngine::Search->new(
{ index => $Koha::SearchEngine::BIBLIOS_INDEX } );
- if ($QParser) {
- $builtquery = $query;
- } else {
- ( undef,$builtquery,undef,undef,undef,undef,undef,undef,undef,undef) = $builder->build_query_compat(undef,\@operands);
- }
+ ( undef, $builtquery, undef, $query_cgi, undef, undef, undef, undef, undef, undef ) =
+ $builder->build_query_compat( undef, \@operands, undef, undef, undef, 0, $lang, { weighted_fields => 1 });
+
+ $template->param( search_query => $builtquery ) if C4::Context->preference('DumpSearchQueryTemplate');
+
# find results
my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page);
# format output
# SimpleSearch() give the results per page we want, so 0 offet here
my $total = @{$marcresults};
- my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, $marcresults );
+ my @newresults = searchResults( {'interface' => 'intranet'}, $query, $total, $results_per_page, 0, 0, $marcresults );
+ foreach my $line (@newresults) {
+ if ( not exists $line->{'size'} ) { $line->{'size'} = "" }
+ }
$template->param(
total => $total_hits,
query => $query,
resultsloop => \@newresults,
- pagination_bar => pagination_bar( "/cgi-bin/koha/cataloguing/addbooks.pl?q=$query&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
+ pagination_bar => pagination_bar( "/cgi-bin/koha/cataloguing/addbooks.pl?$query_cgi&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
);
}
my $countbr = 0;
my @resultsbr;
if ($query) {
-# fill isbn or title, depending on what has been entered
-#u must do check on isbn because u can find number in beginning of title
-#check is on isbn legnth 13 for new isbn and 10 for old isbn
- my ( $title, $isbn );
- if ($query=~/\d/) {
- my $clean_query = $query;
- $clean_query =~ s/-//g; # remove hyphens
- my $querylength = length $clean_query;
- if ( $querylength == 13 || $querylength == 10 ) {
- $isbn = $query;
- }
- }
- if (!$isbn) {
- $title = $query;
- }
- ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn );
+ ( $countbr, @resultsbr ) = BreedingSearch( $query );
}
my $breeding_loop = [];
for my $resultsbr (@resultsbr) {
push @{$breeding_loop}, {
id => $resultsbr->{import_record_id},
isbn => $resultsbr->{isbn},
- copyrightdate => $resultsbr->{copyrightdate},
- editionstatement => $resultsbr->{editionstatement},
file => $resultsbr->{file_name},
title => $resultsbr->{title},
author => $resultsbr->{author},
+ upload_timestamp => $resultsbr->{upload_timestamp}
};
}