#
# 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., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 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 CGI;
+use warnings;
+use CGI qw ( -utf8 );
use C4::Auth;
use C4::Biblio;
use C4::Breeding;
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 => 1 },
+ flagsrequired => { editcatalogue => '*' },
debug => 1,
}
);
# get framework list
my $frameworks = getframeworks;
my @frameworkcodeloop;
-foreach my $thisframeworkcode ( keys %$frameworks ) {
- my %row = (
+foreach my $thisframeworkcode ( sort { uc($frameworks->{$a}->{'frameworktext'}) cmp uc($frameworks->{$b}->{'frameworktext'}) } keys %{$frameworks} ) {
+ push @frameworkcodeloop, {
value => $thisframeworkcode,
frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
- );
- push @frameworkcodeloop, \%row;
+ };
}
+
# Searching the catalog.
if ($query) {
+ # build query
+ my @operands = $query;
+
+ my $QParser;
+ $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
+ my $builtquery;
+ if ($QParser) {
+ $builtquery = $query;
+ } else {
+ my ( $builterror,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type);
+ ( $builterror,$builtquery,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(undef,\@operands);
+ }
+
# find results
- my ( $error, $marcresults, $total_hits ) = SimpleSearch($query);
+ my ( $error, $marcresults, $total_hits ) = SimpleSearch($builtquery, $results_per_page * ($page - 1), $results_per_page);
if ( defined $error ) {
$template->param( error => $error );
output_html_with_http_headers $input, $cookie, $template->output;
exit;
}
-
+
# format output
- my $total = scalar @$marcresults;
- my @newresults = searchResults( $query, $total, $results_per_page, $page-1, 0, @$marcresults );
+ # 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 );
$template->param(
- total => $total,
- query => $query,
- resultsloop => \@newresults,
- pagination_bar => pagination_bar(
- "/cgi-bin/koha/cataloguing/addbooks.pl?q=$query&",
- getnbpages( $total, $results_per_page ),
- $page,
- 'page'
- ),
+ 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' ),
);
}
# fill with books in breeding farm
-my $toggle = 0;
-my ( $title, $isbn );
+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 $querylength = length($query);
-if ( $query =~ /\d/ and ( $querylength eq 13 or $querylength eq 10 ) ) {
- $isbn = $query;
-}
-$title = $query unless $isbn;
-my ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn ) if $query;
-my @breeding_loop = ();
-for ( my $i = 0 ; $i <= $#resultsbr ; $i++ ) {
- my %row_data;
- if ( $i % 2 ) {
- $toggle = 0;
+ 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;
+ }
}
- else {
- $toggle = 1;
+ if (!$isbn) {
+ $title = $query;
}
- $row_data{toggle} = $toggle;
- $row_data{id} = $resultsbr[$i]->{'id'};
- $row_data{isbn} = $resultsbr[$i]->{'isbn'};
- $row_data{file} = $resultsbr[$i]->{'file'};
- $row_data{title} = $resultsbr[$i]->{'title'};
- $row_data{author} = $resultsbr[$i]->{'author'};
- push( @breeding_loop, \%row_data );
+ ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn );
+}
+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},
+ };
}
$template->param(
frameworkcodeloop => \@frameworkcodeloop,
breeding_count => $countbr,
- breeding_loop => \@breeding_loop,
+ breeding_loop => $breeding_loop,
+ z3950_search_params => C4::Search::z3950_search_args($query),
);
output_html_with_http_headers $input, $cookie, $template->output;
+
projects / koha.git / blobdiff