#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
=head1 cataloguing:addbooks.pl
=cut
-use strict;
-use warnings;
-use CGI;
-use C4::Auth;
-use C4::Biblio;
-use C4::Breeding;
-use C4::Output;
-use C4::Koha;
-use C4::Search;
+use Modern::Perl;
-my $input = new CGI;
+use CGI qw ( -utf8 );
+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 = CGI->new;
my $success = $input->param('biblioitem');
my $query = $input->param('q');
-my @value = $input->param('value');
+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.tmpl",
+ template_name => "cataloguing/addbooks.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { editcatalogue => '*' },
- debug => 1,
}
);
-# get framework list
-my $frameworks = getframeworks;
-my @frameworkcodeloop;
-foreach my $thisframeworkcode ( sort {$frameworks->{$a} cmp $frameworks->{$b}}keys %{$frameworks} ) {
- push @frameworkcodeloop, {
- value => $thisframeworkcode,
- frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
- };
-}
-
-
# Searching the catalog.
if ($query) {
# build query
my @operands = $query;
- my ( $builterror,$builtquery,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(undef,\@operands);
+
+ 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 } );
+ ( 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 ) = SimpleSearch($builtquery, $results_per_page * ($page - 1), $results_per_page);
+ my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page);
if ( defined $error ) {
$template->param( error => $error );
# 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'} = "" }
}
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' ),
);
}
#check is on isbn legnth 13 for new isbn and 10 for old isbn
my ( $title, $isbn );
if ($query=~/\d/) {
- my $querylength = length $query;
+ my $clean_query = $query;
+ $clean_query =~ s/-//g; # remove hyphens
+ my $querylength = length $clean_query;
if ( $querylength == 13 || $querylength == 10 ) {
$isbn = $query;
}
};
}
+my $servers = Koha::Z3950Servers->search(
+ {
+ recordtype => 'biblio',
+ servertype => ['zed','sru'],
+ }
+);
+
+my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
$template->param(
- frameworkcodeloop => \@frameworkcodeloop,
+ servers => $servers,
+ frameworks => $frameworks,
breeding_count => $countbr,
breeding_loop => $breeding_loop,
z3950_search_params => C4::Search::z3950_search_args($query),