Koha/labels/label-item-search.pl
Zeno Tajoli 69c42067ce Bug 11222: fix crash that can occur in search for items to add to label batch
This patch fixes a regression on label-item-search.pl introduced by
the patch for bug 9239 where searching for items to add to a label
batch fails with an error if QueryParser is not enabled and you use
the "Added on or before date" search option.

Test plan:

0) Set "UseQueryParser" to "do not try"
1) Start with an installation with bibliografic data and items
   information.
2) Check that in items there are values inside Accession Date

Without the patch:
a) Go in Home› Tools› Labels  and click on 'New batch'
b) Click on 'Add Item(s)'
c) Try to select items with option "Added on or before date"
d) You will receive an error

With the patch:
Try steps a),b), and c)
Now you don't receive an error and you can select items

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Added a description of the problem and copied the test plan from the bug
report, with the addition of the information that QueryParser must be
off to confirm and test.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-11-23 19:54:38 +00:00

266 lines
9.3 KiB
Perl
Executable file

#!/usr/bin/perl
#
# Copyright 2000-2002 Katipo Communications
#
# 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 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.
use strict;
use warnings;
use vars qw($debug $cgi_debug);
use CGI;
use List::Util qw( max min );
use POSIX qw(ceil);
use C4::Auth qw(get_template_and_user);
use C4::Output qw(output_html_with_http_headers);
use C4::Context;
use C4::Dates;
use C4::Search qw(SimpleSearch);
use C4::Biblio qw(TransformMarcToKoha);
use C4::Items qw(GetItemInfosOf get_itemnumbers_of);
use C4::Koha qw(GetItemTypes); # XXX subfield_is_koha_internal_p
use C4::Creators::Lib qw(html_table);
use C4::Debug;
BEGIN {
$debug = $debug || $cgi_debug;
if ($debug) {
require Data::Dumper;
import Data::Dumper qw(Dumper);
}
}
my $query = new CGI;
my $type = $query->param('type');
my $op = $query->param('op') || '';
my $batch_id = $query->param('batch_id');
my $ccl_query = $query->param('ccl_query');
my $startfrom = $query->param('startfrom') || 1;
my ($template, $loggedinuser, $cookie) = (undef, undef, undef);
my (
$total_hits, $orderby, $results, $total, $error,
$marcresults, $idx, $datefrom, $dateto, $ccl_textbox
);
my $resultsperpage = C4::Context->preference('numSearchResults') || '20';
my $show_results = 0;
my $display_columns = [ {_add => {label => "Add Item", link_field => 1}},
{_item_call_number => {label => "Call Number", link_field => 0}},
{_date_accessioned => {label => "Accession Date", link_field => 0}},
{_barcode => {label => "Barcode", link_field => 0}},
{select => {label => "Select", value => "_item_number"}},
];
if ( $op eq "do_search" ) {
my $QParser;
$QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
$idx = $query->param('idx');
$ccl_textbox = $query->param('ccl_textbox');
if ( $ccl_textbox && $idx ) {
$ccl_query = "$idx:$ccl_textbox";
}
$datefrom = $query->param('datefrom');
$dateto = $query->param('dateto');
if ($datefrom) {
$datefrom = C4::Dates->new($datefrom);
if ($QParser) {
$ccl_query .= ' && ' if $ccl_textbox;
$ccl_query .=
"acqdate(" . $datefrom->output("iso") . '-)';
} else {
$ccl_query .= ' and ' if $ccl_textbox;
$ccl_query .=
"acqdate,st-date-normalized,ge=" . $datefrom->output("iso");
}
}
if ($dateto) {
$dateto = C4::Dates->new($dateto);
if ($QParser) {
$ccl_query .= ' && ' if ( $ccl_textbox || $datefrom );
$ccl_query .= "acqdate(-" . $dateto->output("iso") . ')';
} else {
$ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
$ccl_query .= "acqdate,st-date-normalized,le=" . $dateto->output("iso");
}
}
my $offset = $startfrom > 1 ? $startfrom - 1 : 0;
( $error, $marcresults, $total_hits ) =
SimpleSearch( $ccl_query, $offset, $resultsperpage );
if (!defined $error && @{$marcresults} ) {
$show_results = @{$marcresults};
}
else {
$debug and warn "ERROR label-item-search: no results from SimpleSearch";
# leave $show_results undef
}
}
if ($show_results) {
my $hits = $show_results;
my @results_set = ();
my @items =();
# This code needs to be refactored using these subs...
#my @items = &GetItemsInfo( $biblio->{biblionumber}, 'intra' );
#my $dat = &GetBiblioData( $biblio->{biblionumber} );
for ( my $i = 0 ; $i < $hits ; $i++ ) {
my @row_data= ();
#DEBUG Notes: Decode the MARC record from each resulting MARC record...
my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] );
#DEBUG Notes: Transform it to Koha form...
my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
#DEBUG Notes: Stuff the bib into @biblio_data...
push (@results_set, $biblio);
my $biblionumber = $biblio->{'biblionumber'};
#DEBUG Notes: Grab the item numbers associated with this MARC record...
my $itemnums = get_itemnumbers_of($biblionumber);
#DEBUG Notes: Retrieve the item data for each number...
if (my $iii = $itemnums->{$biblionumber}) {
my $item_results = GetItemInfosOf(@$iii);
foreach my $item ( keys %$item_results ) {
#DEBUG Notes: Build an array element 'item' of the correct bib (results) hash which contains item-specific data...
if ($item_results->{$item}->{'biblionumber'} eq $results_set[$i]->{'biblionumber'}) {
my $item_data;
$item_data->{'_item_number'} = $item_results->{$item}->{'itemnumber'};
$item_data->{'_item_call_number'} = ($item_results->{$item}->{'itemcallnumber'} ? $item_results->{$item}->{'itemcallnumber'} : 'NA');
$item_data->{'_date_accessioned'} = $item_results->{$item}->{'dateaccessioned'};
$item_data->{'_barcode'} = ( $item_results->{$item}->{'barcode'} ? $item_results->{$item}->{'barcode'} : 'NA');
$item_data->{'_add'} = $item_results->{$item}->{'itemnumber'};
unshift (@row_data, $item_data); # item numbers are given to us in descending order by get_itemnumbers_of()...
}
}
$results_set[$i]->{'item_table'} = html_table($display_columns, \@row_data);
}
else {
# FIXME: Some error trapping code needed
warn sprintf('No item numbers retrieved for biblio number: %s', $biblionumber);
}
}
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "labels/result.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => { borrowers => 1 },
flagsrequired => { catalogue => 1 },
debug => 1,
}
);
# build page nav stuff.
my ( @field_data, @numbers );
$total = $total_hits;
my ( $from, $to, $startfromnext, $startfromprev, $displaynext,
$displayprev );
if ( $total > $resultsperpage ) {
my $num_of_pages = ceil( $total / $resultsperpage + 1 );
for ( my $page = 1 ; $page < $num_of_pages ; $page++ ) {
my $startfrm = ( ( $page - 1 ) * $resultsperpage ) + 1;
push @numbers,
{
number => $page,
startfrom => $startfrm
};
}
$from = $startfrom;
$startfromprev = $startfrom - $resultsperpage;
$startfromnext = $startfrom + $resultsperpage;
$to =
$startfrom + $resultsperpage > $total
? $total
: $startfrom + $resultsperpage - 1;
# multi page display
$displaynext = 0;
$displayprev = $startfrom > 1 ? $startfrom : 0;
$displaynext = 1 if $to < $total_hits;
}
else {
$displayprev = 0;
$displaynext = 0;
}
$template->param(
total => $total_hits,
from => $from,
to => $to,
startfromnext => $startfromnext,
startfromprev => $startfromprev,
startfrom => $startfrom,
displaynext => $displaynext,
displayprev => $displayprev,
resultsperpage => $resultsperpage,
numbers => \@numbers,
);
$template->param(
results => ($show_results ? 1 : 0),
result_set=> \@results_set,
batch_id => $batch_id,
type => $type,
idx => $idx,
ccl_query => $ccl_query,
);
}
#
# search section
#
else {
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "labels/search.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => { catalogue => 1 },
debug => 1,
}
);
my $itemtypes = GetItemTypes;
my @itemtypeloop;
foreach my $thisitemtype ( keys %$itemtypes ) {
my %row = (
value => $thisitemtype,
description => $itemtypes->{$thisitemtype}->{'description'},
);
push @itemtypeloop, \%row;
}
$template->param(
itemtypeloop => \@itemtypeloop,
batch_id => $batch_id,
type => $type,
);
}
# Print the page
output_html_with_http_headers $query, $cookie, $template->output;