# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
use C4::Auth;
use CGI qw ( -utf8 );
use C4::Context;
-use C4::Branch; # GetBranches
use C4::Output;
use C4::Koha;
use C4::Reports;
use C4::Circulation;
use C4::Biblio qw/GetMarcSubfieldStructureFromKohaField/;
+use Koha::AuthorisedValues;
+use Koha::DateUtils;
+use Koha::ItemTypes;
+
=head1 NAME
plugin that shows a stats on borrowers
=cut
our $debug = 0;
-my $input = new CGI;
+my $input = CGI->new;
my $fullreportname = "reports/catalogue_stats.tt";
my $do_it = $input->param('do_it');
my $line = $input->param("Line");
my $column = $input->param("Column");
my $cellvalue = $input->param("Cellvalue"); # one of 'items', 'biblios', 'deleteditems'
-my @filters = $input->param("Filter");
-my $deweydigits = $input->param("deweydigits");
-my $lccndigits = $input->param("lccndigits");
+my @filters = $input->multi_param("Filter");
my $cotedigits = $input->param("cotedigits");
my $output = $input->param("output");
my $basename = $input->param("basename");
= get_template_and_user({template_name => $fullreportname,
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => {reports => '*'},
debug => 1,
});
$template->param(do_it => $do_it);
if ($do_it) {
- my $results = calculate( $line, $column, $cellvalue, $deweydigits, $lccndigits, $cotedigits, \@filters );
+ my $results = calculate( $line, $column, $cellvalue, $cotedigits, \@filters );
if ( $output eq "screen" ) {
$template->param( mainloop => $results );
output_html_with_http_headers $input, $cookie, $template->output;
exit;
} else {
print $input->header(
- -type => 'application/vnd.sun.xml.calc',
+ -type => 'text/csv',
-encoding => 'utf-8',
-attachment => "$basename.csv",
-name => "$basename.csv"
}
} else {
my $dbh = C4::Context->dbh;
- my @values;
- my %labels;
my $count=0;
- my $req;
- my @select;
- # FIXME: no such field "dewey"
- # $req = $dbh->prepare("select count(dewey) from biblioitems ");
- # $req->execute;
- my $hasdewey = 0;
-
-# (rch) biblioitems.lccn is mapped to lccn MARC21 010$a in default framework.
-# This is not the LC Classification. It's the Control Number.
-# So I'm just going to remove this bit. Call Number is handled in itemcallnumber.
-#
- my $haslccn = 0;
-# $req = $dbh->prepare( "select count(lccn) from biblioitems ");
-# $req->execute;
-# my $hlghtlccn;
-# while (my ($value) =$req->fetchrow) {
-# $hlghtlccn = !($hasdewey);
-# $haslccn =1 if (($value>2) and (! $haslccn));
-# $count++ if (($value) and (! $haslccn));
-# push @select, $value;
-# }
-# my $CGIlccn = {
-# values => \@select,
-# };
-
-# No need to test for data here. If you don't have itemcallnumbers, you probably know it.
-# FIXME: Hardcoding to 5 chars on itemcallnum.
-#
- my $hascote = 1;
- my $highcote = 5;
-
- my $itemtypes = GetItemTypes( style => 'array' );
- my $authvals = GetKohaAuthorisedValues("items.ccode");
- my @authvals;
- foreach ( sort { $authvals->{$a} cmp $authvals->{$b} || $a cmp $b } keys %$authvals ) {
- push @authvals, { code => $_, description => $authvals->{$_} };
- }
+ my $itemtypes = Koha::ItemTypes->search_with_localization;
- my $locations = GetKohaAuthorisedValues("items.location");
- my @locations;
- foreach ( sort keys %$locations ) {
- push @locations, { code => $_, description => "$_ - " . $locations->{$_} };
- }
+ my @authvals = map { { code => $_->{authorised_value}, description => $_->{lib} } } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.ccode' }, { order_by => ['description'] } );
+ my @locations = map { { code => $_->{authorised_value}, description => $_->{lib} } } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' }, { order_by => ['description'] } );
foreach my $kohafield (qw(items.notforloan items.materials)) {
my $subfield_structure = GetMarcSubfieldStructureFromKohaField($kohafield);
my @mime = ( map { +{type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation
$template->param(
- hasdewey => $hasdewey,
- haslccn => $haslccn,
- hascote => $hascote,
itemtypes => $itemtypes,
- CGIBranch => GetBranchesLoop( C4::Context->userenv->{'branch'} ),
locationloop => \@locations,
authvals => \@authvals,
CGIextChoice => \@mime,
sub calculate {
- my ( $line, $column, $cellvalue, $deweydigits, $lccndigits, $cotedigits, $filters ) = @_;
+ my ( $line, $column, $cellvalue, $cotedigits, $filters ) = @_;
my @mainloop;
my @loopfooter;
my @loopcol;
my @loopfilter;
for ( my $i = 0 ; $i <= @$filters ; $i++ ) {
my %cell;
- if ( defined @$filters[$i] and @$filters[$i] ne '' and $i != 15 ) {
- if ( ( ( $i == 1 ) or ( $i == 3 ) or ( $i == 5 ) or ( $i == 9 ) ) and ( @$filters[ $i - 1 ] ) ) {
+ if ( defined @$filters[$i] and @$filters[$i] ne '' and $i != 11 ) {
+ if ( ( ( $i == 1 ) or ( $i == 5 ) ) and ( @$filters[ $i - 1 ] ) ) {
$cell{err} = 1 if ( @$filters[$i] < @$filters[ $i - 1 ] );
}
$cell{filter} .= @$filters[$i];
$cell{crit} .=
- ( $i == 0 ) ? "Dewey Classification From"
- : ( $i == 1 ) ? "Dewey Classification To"
- : ( $i == 2 ) ? "Lccn Classification From"
- : ( $i == 3 ) ? "Lccn Classification To"
- : ( $i == 4 ) ? "Item CallNumber From"
- : ( $i == 5 ) ? "Item CallNumber To"
- : ( $i == 6 ) ? "Item type"
- : ( $i == 7 ) ? "Publisher"
- : ( $i == 8 ) ? "Publication year From"
- : ( $i == 9 ) ? "Publication year To"
- : ( $i == 10 ) ? "Library"
- : ( $i == 11 ) ? "Shelving Location"
- : ( $i == 12 ) ? "Collection Code"
- : ( $i == 13 ) ? "Status"
- : ( $i == 14 ) ? "Materials"
- : ( $i == 16 and $filters->[15] == 0 ) ? "Barcode (not like)"
- : ( $i == 16 and $filters->[15] == 1 ) ? "Barcode (like)"
- : ( $i == 17 ) ? "Acquired date from"
- : ( $i == 18 ) ? "Acquired date to"
- : ( $i == 19 ) ? "Removed date from"
- : ( $i == 20 ) ? "Removed date to"
+ ( $i == 0 ) ? "Item CallNumber From"
+ : ( $i == 1 ) ? "Item CallNumber To"
+ : ( $i == 2 ) ? "Item type"
+ : ( $i == 3 ) ? "Publisher"
+ : ( $i == 4 ) ? "Publication year From"
+ : ( $i == 5 ) ? "Publication year To"
+ : ( $i == 6 ) ? "Library"
+ : ( $i == 7 ) ? "Shelving Location"
+ : ( $i == 8 ) ? "Collection Code"
+ : ( $i == 9 ) ? "Status"
+ : ( $i == 10 ) ? "Materials"
+ : ( $i == 12 and $filters->[11] == 0 ) ? "Barcode (not like)"
+ : ( $i == 12 and $filters->[11] == 1 ) ? "Barcode (like)"
+ : ( $i == 13 ) ? "Date acquired (item) from"
+ : ( $i == 14 ) ? "Date acquired (item) to"
+ : ( $i == 15 ) ? "Date deleted (item) from"
+ : ( $i == 16 ) ? "Date deleted (item) to"
: '';
push @loopfilter, \%cell;
}
}
- @$filters[18] = C4::Dates->new(@$filters[18])->output('iso') if @$filters[18];
- @$filters[19] = C4::Dates->new(@$filters[19])->output('iso') if @$filters[19];
- @$filters[20] = C4::Dates->new(@$filters[20])->output('iso') if @$filters[20];
- @$filters[21] = C4::Dates->new(@$filters[21])->output('iso') if @$filters[21];
+ @$filters[13] = dt_from_string(@$filters[13])->date() if @$filters[13];
+ @$filters[14] = dt_from_string(@$filters[14])->date() if @$filters[14];
+ @$filters[15] = dt_from_string(@$filters[15])->date() if @$filters[15];
+ @$filters[16] = dt_from_string(@$filters[16])->date() if @$filters[16];
my @linefilter;
- $linefilter[0] = @$filters[0] if ( $line =~ /dewey/ );
- $linefilter[1] = @$filters[1] if ( $line =~ /dewey/ );
- $linefilter[0] = @$filters[2] if ( $line =~ /lccn/ );
- $linefilter[1] = @$filters[3] if ( $line =~ /lccn/ );
- $linefilter[0] = @$filters[4] if ( $line =~ /items\.itemcallnumber/ );
- $linefilter[1] = @$filters[5] if ( $line =~ /items\.itemcallnumber/ );
+ $linefilter[0] = @$filters[0] if ( $line =~ /items\.itemcallnumber/ );
+ $linefilter[1] = @$filters[1] if ( $line =~ /items\.itemcallnumber/ );
if ( C4::Context->preference('item-level_itypes') ) {
- $linefilter[0] = @$filters[6] if ( $line =~ /items\.itype/ );
+ $linefilter[0] = @$filters[2] if ( $line =~ /items\.itype/ );
} else {
- $linefilter[0] = @$filters[6] if ( $line =~ /itemtype/ );
- }
- $linefilter[0] = @$filters[7] if ( $line =~ /publishercode/ );
- $linefilter[0] = @$filters[8] if ( $line =~ /publicationyear/ );
- $linefilter[1] = @$filters[9] if ( $line =~ /publicationyear/ );
-
- $linefilter[0] = @$filters[10] if ( $line =~ /items\.homebranch/ );
- $linefilter[0] = @$filters[11] if ( $line =~ /items\.location/ );
- $linefilter[0] = @$filters[12] if ( $line =~ /items\.ccode/ );
- $linefilter[0] = @$filters[13] if ( $line =~ /items\.notforloan/ );
- $linefilter[0] = @$filters[14] if ( $line =~ /items\.materials/ );
- $linefilter[0] = @$filters[17] if ( $line =~ /items\.dateaccessioned/ );
- $linefilter[1] = @$filters[18] if ( $line =~ /items\.dateaccessioned/ );
- $linefilter[0] = @$filters[19] if ( $line =~ /deleteditems\.timestamp/ );
- $linefilter[1] = @$filters[20] if ( $line =~ /deleteditems\.timestamp/ );
+ $linefilter[0] = @$filters[2] if ( $line =~ /itemtype/ );
+ }
+ $linefilter[0] = @$filters[3] if ( $line =~ /publishercode/ );
+ $linefilter[0] = @$filters[4] if ( $line =~ /publicationyear/ );
+ $linefilter[1] = @$filters[5] if ( $line =~ /publicationyear/ );
+
+ $linefilter[0] = @$filters[6] if ( $line =~ /items\.homebranch/ );
+ $linefilter[0] = @$filters[7] if ( $line =~ /items\.location/ );
+ $linefilter[0] = @$filters[8] if ( $line =~ /items\.ccode/ );
+ $linefilter[0] = @$filters[9] if ( $line =~ /items\.notforloan/ );
+ $linefilter[0] = @$filters[10] if ( $line =~ /items\.materials/ );
+ $linefilter[0] = @$filters[13] if ( $line =~ /items\.dateaccessioned/ );
+ $linefilter[1] = @$filters[14] if ( $line =~ /items\.dateaccessioned/ );
+ $linefilter[0] = @$filters[15] if ( $line =~ /deleteditems\.timestamp/ );
+ $linefilter[1] = @$filters[16] if ( $line =~ /deleteditems\.timestamp/ );
my @colfilter;
- $colfilter[0] = @$filters[0] if ( $column =~ /dewey/ );
- $colfilter[1] = @$filters[1] if ( $column =~ /dewey/ );
- $colfilter[0] = @$filters[2] if ( $column =~ /lccn/ );
- $colfilter[1] = @$filters[3] if ( $column =~ /lccn/ );
- $colfilter[0] = @$filters[4] if ( $column =~ /items\.itemcallnumber/ );
- $colfilter[1] = @$filters[5] if ( $column =~ /items\.itemcallnumber/ );
+ $colfilter[0] = @$filters[0] if ( $column =~ /items\.itemcallnumber/ );
+ $colfilter[1] = @$filters[1] if ( $column =~ /items\.itemcallnumber/ );
if ( C4::Context->preference('item-level_itypes') ) {
- $colfilter[0] = @$filters[6] if ( $column =~ /items\.itype/ );
+ $colfilter[0] = @$filters[2] if ( $column =~ /items\.itype/ );
} else {
- $colfilter[0] = @$filters[6] if ( $column =~ /itemtype/ );
- }
- $colfilter[0] = @$filters[7] if ( $column =~ /publishercode/ );
- $colfilter[0] = @$filters[8] if ( $column =~ /publicationyear/ );
- $colfilter[1] = @$filters[9] if ( $column =~ /publicationyear/ );
- $colfilter[0] = @$filters[10] if ( $column =~ /items\.homebranch/ );
- $colfilter[0] = @$filters[11] if ( $column =~ /items\.location/ );
- $colfilter[0] = @$filters[12] if ( $column =~ /items\.ccode/ );
- $colfilter[0] = @$filters[13] if ( $column =~ /items\.notforloan/ );
- $colfilter[0] = @$filters[14] if ( $column =~ /items\.materials/ );
- $colfilter[0] = @$filters[17] if ( $column =~ /items.dateaccessioned/ );
- $colfilter[1] = @$filters[18] if ( $column =~ /items\.dateaccessioned/ );
- $colfilter[0] = @$filters[19] if ( $column =~ /deleteditems\.timestamp/ );
- $colfilter[1] = @$filters[20] if ( $column =~ /deleteditems\.timestamp/ );
+ $colfilter[0] = @$filters[2] if ( $column =~ /itemtype/ );
+ }
+ $colfilter[0] = @$filters[3] if ( $column =~ /publishercode/ );
+ $colfilter[0] = @$filters[4] if ( $column =~ /publicationyear/ );
+ $colfilter[1] = @$filters[5] if ( $column =~ /publicationyear/ );
+ $colfilter[0] = @$filters[6] if ( $column =~ /items\.homebranch/ );
+ $colfilter[0] = @$filters[7] if ( $column =~ /items\.location/ );
+ $colfilter[0] = @$filters[8] if ( $column =~ /items\.ccode/ );
+ $colfilter[0] = @$filters[9] if ( $column =~ /items\.notforloan/ );
+ $colfilter[0] = @$filters[10] if ( $column =~ /items\.materials/ );
+ $colfilter[0] = @$filters[13] if ( $column =~ /items.dateaccessioned/ );
+ $colfilter[1] = @$filters[14] if ( $column =~ /items\.dateaccessioned/ );
+ $colfilter[0] = @$filters[15] if ( $column =~ /deleteditems\.timestamp/ );
+ $colfilter[1] = @$filters[16] if ( $column =~ /deleteditems\.timestamp/ );
# 1st, loop rows.
my $origline = $line;
$line =~ s/^items\./deleteditems./ if($cellvalue eq "deleteditems");
my $linefield;
- if ( ( $line =~ /dewey/ ) and ($deweydigits) ) {
- $linefield = "left($line,$deweydigits)";
- } elsif ( ( $line =~ /lccn/ ) and ($lccndigits) ) {
- $linefield = "left($line,$lccndigits)";
- } elsif ( ( $line =~ /itemcallnumber/ ) and ($cotedigits) ) {
+ if ( ( $line =~ /itemcallnumber/ ) and ($cotedigits) ) {
$linefield = "left($line,$cotedigits)";
} elsif ( $line =~ /^deleteditems\.timestamp$/ ) {
$linefield = "DATE($line)";
} else {
$sth->execute();
}
- my $rowauthvals = GetKohaAuthorisedValues($origline);
+ my $rowauthvals = { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => $origline } ) };
while ( my ($celvalue) = $sth->fetchrow ) {
my %cell;
if (defined $celvalue and $celvalue ne '') {
my $origcolumn = $column;
$column =~ s/^items\./deleteditems./ if($cellvalue eq "deleteditems");
my $colfield;
- if ( ( $column =~ /dewey/ ) and ($deweydigits) ) {
- $colfield = "left($column,$deweydigits)";
- } elsif ( ( $column =~ /lccn/ ) and ($lccndigits) ) {
- $colfield = "left($column,$lccndigits)";
- } elsif ( ( $column =~ /itemcallnumber/ ) and ($cotedigits) ) {
+ if ( ( $column =~ /itemcallnumber/ ) and ($cotedigits) ) {
$colfield = "left($column,$cotedigits)";
} elsif ( $column =~ /^deleteditems\.timestamp$/ ) {
$colfield = "DATE($column)";
} else {
$sth2->execute();
}
- my $colauthvals = GetKohaAuthorisedValues($origcolumn);
+ my $colauthvals = { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => $origcolumn } ) };
while ( my ($celvalue) = $sth2->fetchrow ) {
my %cell;
if (defined $celvalue and $celvalue ne '') {
}
my $i = 0;
- my @totalcol;
my $hilighted = -1;
#Initialization of cell values.....
LEFT JOIN biblioitems ON ($itemstable.biblioitemnumber = biblioitems.biblioitemnumber)
LEFT JOIN biblio ON (biblioitems.biblionumber = biblio.biblionumber)
WHERE 1 ";
- $strcalc .= "AND barcode $not like ? " if ($barcodefilter);
+
+ my @sqlargs;
+
+ if ($barcodefilter) {
+ $strcalc .= "AND barcode $not like ? ";
+ push @sqlargs, $barcodefilter;
+ }
if ( @$filters[0] ) {
+ $strcalc .= " AND $itemstable.itemcallnumber >= ? ";
@$filters[0] =~ s/\*/%/g;
- $strcalc .= " AND dewey >" . @$filters[0];
+ push @sqlargs, @$filters[0];
}
+
if ( @$filters[1] ) {
+ $strcalc .= " AND $itemstable.itemcallnumber <= ? ";
@$filters[1] =~ s/\*/%/g;
- $strcalc .= " AND dewey <" . @$filters[1];
+ push @sqlargs, @$filters[1];
}
+
if ( @$filters[2] ) {
+ $strcalc .= " AND " . ( C4::Context->preference('item-level_itypes') ? "$itemstable.itype" : 'biblioitems.itemtype' ) . " LIKE ? ";
@$filters[2] =~ s/\*/%/g;
- $strcalc .= " AND lccn >" . @$filters[2];
+ push @sqlargs, @$filters[2];
}
+
if ( @$filters[3] ) {
+ $strcalc .= " AND biblioitems.publishercode LIKE ? ";
@$filters[3] =~ s/\*/%/g;
- $strcalc .= " AND lccn <" . @$filters[3];
+ @$filters[3] .= "%" unless @$filters[3] =~ /%/;
+ push @sqlargs, @$filters[3];
}
if ( @$filters[4] ) {
+ $strcalc .= " AND " .
+ (C4::Context->preference('marcflavour') eq 'UNIMARC' ? 'publicationyear' : 'copyrightdate')
+ . "> ? ";
@$filters[4] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.itemcallnumber >=" . $dbh->quote( @$filters[4] );
+ push @sqlargs, @$filters[4];
}
-
if ( @$filters[5] ) {
@$filters[5] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.itemcallnumber <=" . $dbh->quote( @$filters[5] );
+ $strcalc .= " AND " .
+ (C4::Context->preference('marcflavour') eq 'UNIMARC' ? 'publicationyear' : 'copyrightdate')
+ . "< ? ";
+ push @sqlargs, @$filters[5];
}
-
if ( @$filters[6] ) {
+ $strcalc .= " AND $itemstable.homebranch LIKE ? ";
@$filters[6] =~ s/\*/%/g;
- $strcalc .= " AND " . ( C4::Context->preference('item-level_itypes') ? "$itemstable.itype" : 'biblioitems.itemtype' ) . " LIKE '" . @$filters[6] . "'";
+ push @sqlargs, @$filters[6];
}
-
if ( @$filters[7] ) {
+ $strcalc .= " AND $itemstable.location LIKE ? ";
@$filters[7] =~ s/\*/%/g;
- @$filters[7] .= "%" unless @$filters[7] =~ /%/;
- $strcalc .= " AND biblioitems.publishercode LIKE \"" . @$filters[7] . "\"";
+ push @sqlargs, @$filters[7];
}
if ( @$filters[8] ) {
+ $strcalc .= " AND $itemstable.ccode LIKE ? ";
@$filters[8] =~ s/\*/%/g;
- $strcalc .= " AND " .
- (C4::Context->preference('marcflavour') eq 'UNIMARC' ? 'publicationyear' : 'copyrightdate')
- . ">" . @$filters[8];
+ push @sqlargs, @$filters[8];
}
- if ( @$filters[9] ) {
+ if ( defined @$filters[9] and @$filters[9] ne '' ) {
+ $strcalc .= " AND $itemstable.notforloan LIKE ? ";
@$filters[9] =~ s/\*/%/g;
- $strcalc .= " AND " .
- (C4::Context->preference('marcflavour') eq 'UNIMARC' ? 'publicationyear' : 'copyrightdate')
- . "<" . @$filters[9];
+ push @sqlargs, @$filters[9];
}
- if ( @$filters[10] ) {
+ if ( defined @$filters[10] and @$filters[10] ne '' ) {
+ $strcalc .= " AND $itemstable.materials LIKE ? ";
@$filters[10] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.homebranch LIKE '" . @$filters[10] . "'";
+ push @sqlargs, @$filters[10];
}
- if ( @$filters[11] ) {
- @$filters[11] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.location LIKE '" . @$filters[11] . "'";
- }
- if ( @$filters[12] ) {
- @$filters[12] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.ccode LIKE '" . @$filters[12] . "'";
- }
- if ( defined @$filters[13] and @$filters[13] ne '' ) {
+ if ( @$filters[13] ) {
+ $strcalc .= " AND $itemstable.dateaccessioned >= ? ";
@$filters[13] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.notforloan LIKE '" . @$filters[13] . "'";
+ push @sqlargs, @$filters[13];
}
- if ( defined @$filters[14] and @$filters[14] ne '' ) {
+ if ( @$filters[14] ) {
+ $strcalc .= " AND $itemstable.dateaccessioned <= ? ";
@$filters[14] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.materials LIKE '" . @$filters[14] . "'";
- }
- if ( @$filters[17] ) {
- @$filters[17] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.dateaccessioned >= '@$filters[17]' ";
- }
- if ( @$filters[18] ) {
- @$filters[18] =~ s/\*/%/g;
- $strcalc .= " AND $itemstable.dateaccessioned <= '@$filters[18]' ";
+ push @sqlargs, @$filters[14];
}
- if ( $cellvalue eq 'deleteditems' and @$filters[19] ) {
- @$filters[19] =~ s/\*/%/g;
- $strcalc .= " AND DATE(deleteditems.timestamp) >= '@$filters[19]' ";
+ if ( $cellvalue eq 'deleteditems' and @$filters[15] ) {
+ $strcalc .= " AND DATE(deleteditems.timestamp) >= ? ";
+ @$filters[15] =~ s/\*/%/g;
+ push @sqlargs, @$filters[15];
}
- if ( $cellvalue eq 'deleteditems' and @$filters[20] ) {
- @$filters[20] =~ s/\*/%/g;
- $strcalc .= " AND DATE(deleteditems.timestamp) <= '@$filters[20]' ";
+ if ( $cellvalue eq 'deleteditems' and @$filters[16] ) {
+ @$filters[16] =~ s/\*/%/g;
+ $strcalc .= " AND DATE(deleteditems.timestamp) <= ?";
+ push @sqlargs, @$filters[16];
}
$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
$debug and warn "SQL: $strcalc";
my $dbcalc = $dbh->prepare($strcalc);
- if ($barcodefilter) {
- $dbcalc->execute($barcodefilter);
- } else {
- $dbcalc->execute();
- }
+ $dbcalc->execute(@sqlargs);
while ( my ( $row, $col, $value ) = $dbcalc->fetchrow ) {
projects / koha-ffzg.git / blobdiff