#!/usr/bin/perl
-## Will not work. Requires a complete re-write for ZEBRA
-# $Id$
+
# Copyright 2000-2002 Katipo Communications
#
# Suite 330, Boston, MA 02111-1307 USA
use strict;
+# use warnings; # FIXME
use C4::Auth;
use CGI;
use C4::Context;
-use C4::Search;
+use C4::Branch; # GetBranches
use C4::Output;
use C4::Koha;
-use C4::Interface::CGI::Output;
-use C4::Circulation::Circ2;
+use C4::Reports;
+use C4::Circulation;
=head1 NAME
-plugin that shows a stats on catalogue
+plugin that shows a stats on borrowers
=head1 DESCRIPTION
-
-=over2
+=over 2
=cut
+our $debug = 0;
my $input = new CGI;
-my $do_it=$input->param('do_it');
my $fullreportname = "reports/catalogue_stats.tmpl";
-my $line = $input->param("Line");
-my $column = $input->param("Column");
-my @filters = $input->param("Filter");
+my $do_it = $input->param('do_it');
+my $line = $input->param("Line");
+my $column = $input->param("Column");
+my @filters = $input->param("Filter");
my $deweydigits = $input->param("deweydigits");
-my $lccndigits = $input->param("lccndigits");
-my $cotedigits = $input->param("cotedigits");
-my $output = $input->param("output");
-my $basename = $input->param("basename");
-my $mime = $input->param("MIME");
-my $del = $input->param("sep");
+my $lccndigits = $input->param("lccndigits");
+my $cotedigits = $input->param("cotedigits");
+my $output = $input->param("output");
+my $basename = $input->param("basename");
+my $mime = $input->param("MIME");
+our $sep = $input->param("sep");
+$sep = "\t" if ($sep eq 'tabulation');
+my $item_itype;
+if(C4::Context->preference('item-level_itypes')) {
+ $item_itype = "items\.itype"
+} else {
+ $item_itype = "itemtype";
+}
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => $fullreportname,
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {editcatalogue => 1},
+ flagsrequired => {reports => 1},
debug => 1,
});
$template->param(do_it => $do_it);
exit(1);
} else {
print $input->header(-type => 'application/vnd.sun.xml.calc',
+ -encoding => 'utf-8',
-attachment=>"$basename.csv",
-name=>"$basename.csv" );
- my $cols = @$results[0]->{loopcol};
+ my $cols = @$results[0]->{loopcol};
my $lines = @$results[0]->{looprow};
- my $sep;
- $sep =C4::Context->preference("delimiter");
print @$results[0]->{line} ."/". @$results[0]->{column} .$sep;
foreach my $col ( @$cols ) {
print $col->{coltitle}.$sep;
my %labels;
my $count=0;
my $req;
-###Use mfield of koha_attr instead of dewey
-my $sth = $dbh->prepare("select authorised_value from authorised_values where category='mfield' order by lib");
- $sth->execute;
- my @authorised_values;
- #push @authorised_values,"";
- while ((my $category) = $sth->fetchrow_array) {
- push @authorised_values, $category;
- }
-my $hasdewey;
- my $CGIdewey=CGI::scrolling_list( -name => 'Filter',
- -id => 'Filter',
- -values => \@authorised_values,
- -size => 1,
- -multiple => 0 );
-
-
- my $haslccn=1;
- my $hlghtlccn=1;
my @select;
- for my $value ("A".."Z") {
- push @select, $value;
- }
- my $CGIlccn=CGI::scrolling_list( -name => 'Filter',
- -id => 'Filter',
- -values => \@select,
- -size => 1,
- -multiple => 0 );
-
- my $hascote;
- my $hlghtcote;
- $count++;
- my $hglghtDT =$count % 2;
- $count++;
- my $hglghtPub =$count % 2;
- $count++;
- my $hglghtPY =$count % 2;
- $count++;
- my $hglghtHB =$count % 2;
- $count++;
- my $hglghtLOC =$count % 2;
- my $hglghtSTACK =$count % 2;
-
- my $itemtypes = GetItemTypes;
- undef @select;
- push @select,"";
- my %select_item;
- $select_item{""} = "";
-foreach my $thisitemtype (sort keys %$itemtypes) {
- push @select,$thisitemtype;
- $select_item{$thisitemtype}=$itemtypes->{$thisitemtype}->{'description'};
+ # FIXME: no such field "dewey"
+ # $req = $dbh->prepare("select count(dewey) from biblioitems ");
+ # $req->execute;
+ my $hasdewey = 0;
-}
-
- my $CGIitemtype=CGI::scrolling_list( -name => 'Filter',
- -id => 'itemtype',
- -values => \@select,
- -labels=>\%select_item,
- -size => 1,
- -multiple => 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=CGI::scrolling_list( -name => 'Filter',
+# -id => 'Filter',
+# -values => \@select,
+# -size => 1,
+# -multiple => 0 );
- undef @select;
- push @select,"";
- my $branches=GetBranches();
- my %select_branches;
- $select_branches{""} = "";
- foreach my $branch (keys %$branches) {
- push @select, $branch;
- $select_branches{$branch} = $branches->{$branch}->{'branchname'};
- }
- my $CGIbranch=CGI::scrolling_list( -name => 'Filter',
- -id => 'branch',
- -values => \@select,
- -labels => \%select_branches,
- -size => 1,
- -multiple => 0 );
+# 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 $CGIholdingbranch=CGI::scrolling_list( -name => 'Filter',
- -id => 'holdingbranch',
- -values => \@select,
- -labels => \%select_branches,
- -size => 1,
- -multiple => 0 );
- $req = $dbh->prepare("select authorised_value,lib from authorised_values where category='sections'");
+ $req = $dbh->prepare("select itemtype, description from itemtypes order by description");
$req->execute;
- undef @select;
- push @select,"";
- my %desc;
- $desc{""}="";
- while (my ($value,$desc) =$req->fetchrow) {
- push @select, $value;
- $desc{$value}=$desc;
- }
+ my $CGIitemtype = $req->fetchall_arrayref({});
- my $CGISTACK=CGI::scrolling_list( -name => 'Filter',
- -id => 'shelf',
- -values => \@select,
- -labels =>\%desc,
- -size => 1,
- -multiple => 0 );
-
- my @mime = ( C4::Context->preference("MIME") );
- foreach my $mime (@mime){
-# warn "".$mime;
+ 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 $CGIextChoice=CGI::scrolling_list(
- -name => 'MIME',
- -id => 'MIME',
- -values => \@mime,
- -size => 1,
- -multiple => 0 );
+ my $locations = GetKohaAuthorisedValues("items.location");
+ my @locations;
+ foreach (sort keys %$locations) {
+ push @locations, { code => $_, description => "$_ - " . $locations->{$_} };
+ }
- my @dels = ( C4::Context->preference("delimiter") );
- my $CGIsepChoice=CGI::scrolling_list(
- -name => 'sep',
- -id => 'sep',
- -values => \@dels,
- -size => 1,
- -multiple => 0 );
+ my @mime = ( map { +{type =>$_} } (split /[;:]/,C4::Context->preference("MIME")) );
$template->param(hasdewey=>$hasdewey,
- CGIFromDeweyClass => $CGIdewey,
- CGIToDeweyClass => $CGIdewey,
- haslccn=> $haslccn,
- hlghtlccn => $hlghtlccn,
- CGIFromLoCClass => $CGIlccn,
- CGIToLoCClass => $CGIlccn,
- hascote=> $hascote,
- hlghtcote => $hlghtcote,
- hglghtDT => $hglghtDT,
- hglghtPub => $hglghtPub,
- hglghtPY => $hglghtPY,
- hglghtHB => $hglghtHB,
- hglghtLOC => $hglghtLOC,
- hglghtSTACK => $hglghtSTACK,
+ haslccn => $haslccn,
+ hascote => $hascote,
CGIItemType => $CGIitemtype,
- CGIBranch => $CGIbranch,
- CGILocation => $CGIbranch,
- CGISTACK => $CGISTACK,
- CGIextChoice => $CGIextChoice,
- CGIsepChoice => $CGIsepChoice
+ CGIBranch => GetBranchesLoop(C4::Context->userenv->{'branch'}),
+ locationloop => \@locations,
+ authvals => \@authvals,
+ CGIextChoice => \@mime,
+ CGIsepChoice => GetDelimiterChoices,
+ item_itype => $item_itype
);
}
output_html_with_http_headers $input, $cookie, $template->output;
+## End of Main Body
sub calculate {
my @looprow;
my %globalline;
my $grantotal =0;
+ my $barcodelike = @$filters[13];
+ my $barcodefilter = @$filters[14];
+ my $not;
+
# extract parameters
my $dbh = C4::Context->dbh;
+# if barcodefilter is empty set as %
+if($barcodefilter){
+ # Check if barcodefilter is "like" or "not like"
+ if(!$barcodelike){
+ $not = "not";
+ }
+ # Change * to %
+ $barcodefilter =~ s/\*/%/g;
+}else{
+ $barcodefilter = "%";
+}
+
# Filters
# Checking filters
#
my @loopfilter;
- for (my $i=0;$i<=11;$i++) {
+ for (my $i=0;$i<=12;$i++) {
my %cell;
if ( @$filters[$i] ) {
if ((($i==1) or ($i==3) or ($i==5) or ($i==9)) and (@$filters[$i-1])) {
$cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ;
}
$cell{filter} .= @$filters[$i];
- $cell{crit} .="Dewey Classification From" if ($i==0);
- $cell{crit} .="Dewey Classification To" if ($i==1);
- $cell{crit} .="Classification From" if ($i==2);
- $cell{crit} .="Classification To" if ($i==3);
- $cell{crit} .="Call Number From" if ($i==4);
- $cell{crit} .="Call Number To" if ($i==5);
- $cell{crit} .="Document type" if ($i==6);
- $cell{crit} .="Publisher" if ($i==7);
- $cell{crit} .="Publication year From" if ($i==8);
- $cell{crit} .="Publication year To" if ($i==9);
- $cell{crit} .="Branch :" if ($i==10);
- $cell{crit} .="Location:" if ($i==11);
- $cell{crit} .="Shelving:" if ($i==12);
+ $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 :" : '';
push @loopfilter, \%cell;
}
}
+# warn map {"filtres $_\n"} @filters[0..3];
+
my @linefilter;
-# warn "filtres ".@filters[0];
-# warn "filtres ".@filters[1];
-# warn "filtres ".@filters[2];
-# warn "filtres ".@filters[3];
-
$linefilter[0] = @$filters[0] if ($line =~ /dewey/ ) ;
$linefilter[1] = @$filters[1] if ($line =~ /dewey/ ) ;
- $linefilter[0] = @$filters[2] if ($line =~ /classification/ ) ;
- $linefilter[1] = @$filters[3] if ($line =~ /classification/ ) ;
- $linefilter[0] = @$filters[4] if ($line =~ /itemcallnumber/ ) ;
- $linefilter[1] = @$filters[5] if ($line =~ /itemcallnumber/ ) ;
- $linefilter[0] = @$filters[6] if ($line =~ /itemtype/ ) ;
+ $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/ ) ;
+ if (C4::Context->preference('item-level_itypes')) {
+ $linefilter[0] = @$filters[6] 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 =~ /homebranch/ ) ;
- $linefilter[0] = @$filters[11] if ($line =~ /holdingbranch/ ) ;
- $linefilter[0] = @$filters[12] if ($line =~ /shelf/ ) ;
-#
+ $linefilter[0] = @$filters[10] if ($line =~ /items\.homebranch/ ) ;
+ $linefilter[0] = @$filters[11] if ($line =~ /items\.location/ ) ;
+ $linefilter[0] = @$filters[12] if ($line =~ /items\.ccode/ ) ;
+
my @colfilter ;
$colfilter[0] = @$filters[0] if ($column =~ /dewey/ ) ;
$colfilter[1] = @$filters[1] if ($column =~ /dewey/ ) ;
- $colfilter[0] = @$filters[2] if ($column =~ /classification/ ) ;
- $colfilter[1] = @$filters[3] if ($column =~ /classification/ ) ;
- $colfilter[0] = @$filters[4] if ($column =~ /itemcallnumber/ ) ;
- $colfilter[1] = @$filters[5] if ($column =~ /itemcallnumber/ ) ;
- $colfilter[0] = @$filters[6] if ($column =~ /itemtype/ ) ;
+ $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/ ) ;
+ if (C4::Context->preference('item-level_itypes')) {
+ $colfilter[0] = @$filters[6] 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 =~ /homebranch/ ) ;
- $colfilter[0] = @$filters[11] if ($column =~ /holdingbranch/ ) ;
- $colfilter[0] = @$filters[12] if ($column =~ /shelf/ ) ;
+ $colfilter[0] = @$filters[10] if ($column =~ /items\.homebranch/ ) ;
+ $colfilter[0] = @$filters[11] if ($column =~ /items\.location/ ) ;
+ $colfilter[0] = @$filters[12] if ($column =~ /items\.ccode/ ) ;
+
# 1st, loop rows.
my $linefield;
if (($line =~/dewey/) and ($deweydigits)) {
$linefield .="left($line,$deweydigits)";
- } elsif (($line=~/classification/) and ($lccndigits)) {
+ } elsif (($line=~/lccn/) and ($lccndigits)) {
$linefield .="left($line,$lccndigits)";
- } elsif (($line=~/itemcallnumber/) and ($cotedigits)) {
+ } elsif (($line=~/items.itemcallnumber/) and ($cotedigits)) {
$linefield .="left($line,$cotedigits)";
}else {
$linefield .= $line;
}
-
-warn $linefield,$colfilter[0],$linefilter[0],$line;
+
my $strsth;
- $strsth .= "select distinctrow $linefield from biblio left join items on (items.biblionumber = biblio.biblionumber) where $line is not null ";
+ $strsth .= "select distinctrow $linefield from biblioitems left join items on (items.biblioitemnumber = biblioitems.biblioitemnumber) where barcode $not LIKE ? AND $line is not null ";
if ( @linefilter ) {
if ($linefilter[1]){
$strsth .= " and $line >= ? " ;
}
}
$strsth .=" order by $linefield";
- warn "". $strsth;
+ $debug and print STDERR "catalogue_stats SQL: $strsth\n";
my $sth = $dbh->prepare( $strsth );
if (( @linefilter ) and ($linefilter[1])){
- $sth->execute($linefilter[0],$linefilter[1]);
- } elsif ($linefilter[0]) {
- $sth->execute($linefilter[0]);
+ $sth->execute($barcodefilter,$linefilter[0],$linefilter[1]);
+ } elsif ($barcodefilter,$linefilter[0]) {
+ $sth->execute($barcodefilter,$linefilter[0]);
} else {
- $sth->execute;
+ $sth->execute($barcodefilter);
}
while ( my ($celvalue) = $sth->fetchrow) {
my %cell;
# 2nd, loop cols.
my $colfield;
if (($column =~/dewey/) and ($deweydigits)) {
- $colfield .="left($column,$deweydigits)";
- }elsif (($column=~/classification/) and ($lccndigits)) {
- $colfield .="left($column,$lccndigits)";
+ $colfield = "left($column,$deweydigits)";
+ }elsif (($column=~/lccn/) and ($lccndigits)) {
+ $colfield = "left($column,$lccndigits)";
}elsif (($column=~/itemcallnumber/) and ($cotedigits)) {
- $colfield .="left($column,$cotedigits)";
+ $colfield = "left($column,$cotedigits)";
}else {
- $colfield .= $column;
+ $colfield = $column;
}
- my $strsth2;
- $strsth2 .= "select distinctrow $colfield from biblio left join items on (items.biblionumber = biblio.biblionumber) where $column is not null ";
+ my $strsth2 = "
+ SELECT distinctrow $colfield
+ FROM biblioitems
+ LEFT JOIN items
+ ON (items.biblioitemnumber = biblioitems.biblioitemnumber)
+ WHERE barcode $not LIKE ? AND $column IS NOT NULL ";
if (( @colfilter ) and ($colfilter[1])) {
$strsth2 .= " and $column> ? and $column< ?";
}elsif ($colfilter[0]){
$strsth2 .= " and $column LIKE ? ";
}
$strsth2 .= " order by $colfield";
- warn "". $strsth2;
+ $debug and print STDERR "SQL: $strsth2";
my $sth2 = $dbh->prepare( $strsth2 );
if ((@colfilter) and ($colfilter[1])) {
- $sth2->execute($colfilter[0],$colfilter[1]);
+ $sth2->execute($barcodefilter,$colfilter[0],$colfilter[1]);
} elsif ($colfilter[0]){
- $sth2->execute($colfilter[0]);
+ $sth2->execute($barcodefilter,$colfilter[0]);
} else {
- $sth2->execute;
+ $sth2->execute($barcodefilter);
}
while (my ($celvalue) = $sth2->fetchrow) {
my %cell;
push @loopcol, \%cell;
}
-
my $i=0;
my @totalcol;
my $hilighted=-1;
}
$table{$row->{rowtitle}}->{totalrow}=0;
}
-my @kohafield;
-my @values;
-my @and_or;
-my @relations;
-# preparing calculation in zebra
- my $strcalc .= "SELECT $linefield, $colfield, count( * ) FROM biblioitems LEFT JOIN items ON (items.biblioitemnumber = biblioitems.biblioitemnumber) WHERE 1";
+
+# preparing calculation
+ my $strcalc .= "SELECT $linefield, $colfield, count(*) FROM biblioitems LEFT JOIN items ON (items.biblioitemnumber = biblioitems.biblioitemnumber) WHERE 1 AND barcode $not like ? ";
if (@$filters[0]){
@$filters[0]=~ s/\*/%/g;
- $strcalc .= " AND dewey >" . @$filters[0] ."";
- push @and_or, "\@and";
- push @relations "\@attr 2=5";
- push @kohafield, "dewey";
- push @values, @$filters[0] ;
-
+ $strcalc .= " AND dewey >" . @$filters[0];
}
if (@$filters[1]){
@$filters[1]=~ s/\*/%/g ;
- $strcalc .= " AND dewey <" . @$filters[1] ."";
- push @and_or, "\@and";
- push @relations "\@attr 2=1";
- push @kohafield, "dewey";
- push @values, @$filters[1] ;
-
-
+ $strcalc .= " AND dewey <" . @$filters[1];
}
if (@$filters[2]){
@$filters[2]=~ s/\*/%/g ;
- $strcalc .= " AND classification >=" .$dbh->quote(@$filters[2]) ."" ;
- push @and_or, "\@and";
- push @relations "\@attr 2=4";
- push @kohafield, "classification";
- push @values, @$filters[2];
-
+ $strcalc .= " AND lccn >" . @$filters[2];
}
if (@$filters[3]){
@$filters[3]=~ s/\*/%/g;
- $strcalc .= " AND classification <=" . $dbh->quote(@$filters[3]) ."" ;
- push @and_or, "\@and";
- push @relations "\@attr 2=2";
- push @kohafield, "classification";
- push @values, @$filters[3] ;
+ $strcalc .= " AND lccn <" . @$filters[3];
}
if (@$filters[4]){
@$filters[4]=~ s/\*/%/g ;
- $strcalc .= " AND items.itemcallnumber >=" . $dbh->quote(@$filters[4]) ."" ;
- push @and_or, "\@and";
- push @relations "\@attr 2=4";
- push @kohafield, "itemcallnumber";
- push @values, @$filters[4] ;
+ $strcalc .= " AND items.itemcallnumber >=" . $dbh->quote(@$filters[4]);
}
if (@$filters[5]){
@$filters[5]=~ s/\*/%/g;
- $strcalc .= " AND items.itemcallnumber <=" . $dbh->quote(@$filters[5]) ."" ;
- push @and_or, "\@and";
- push @relations "\@attr 2=2";
- push @kohafield, "itemcallnumber";
- push @values, @$filters[5] ;
+ $strcalc .= " AND items.itemcallnumber <=" . $dbh->quote(@$filters[5]);
}
if (@$filters[6]){
@$filters[6]=~ s/\*/%/g;
- $strcalc .= " AND biblioitems.itemtype like '" . @$filters[6] ."'";
- push @and_or, "\@and";
- push @relations "\@attr 2=3";
- push @kohafield, "itemtype";
- push @values, @$filters[6] ;
+ $strcalc .= " AND " .
+ (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype')
+ . " LIKE '" . @$filters[6] ."'";
}
if (@$filters[7]){
@$filters[7]=~ s/\*/%/g;
@$filters[7].="%" unless @$filters[7]=~/%/;
- $strcalc .= " AND biblioitems.publishercode like \"" . @$filters[7] ."\"";
- push @and_or, "\@and";
- push @relations "\@attr 2=3";
- push @kohafield, "publishercode";
- push @values, @$filters[7];
+ $strcalc .= " AND biblioitems.publishercode LIKE \"" . @$filters[7] ."\"";
}
if (@$filters[8]){
@$filters[8]=~ s/\*/%/g;
- $strcalc .= " AND publicationyear >" . @$filters[8] ."" ;
+ $strcalc .= " AND publicationyear >" . @$filters[8];
}
if (@$filters[9]){
@$filters[9]=~ s/\*/%/g;
- $strcalc .= " AND publicationyear <" . @$filters[9] ."";
+ $strcalc .= " AND publicationyear <" . @$filters[9];
}
if (@$filters[10]){
@$filters[10]=~ s/\*/%/g;
- $strcalc .= " AND items.homebranch like '" . @$filters[10] ."'";
+ $strcalc .= " AND items.homebranch LIKE '" . @$filters[10] ."'";
}
if (@$filters[11]){
@$filters[11]=~ s/\*/%/g;
- $strcalc .= " AND items.holdingbranch like '" . @$filters[11] ."'" if ( @$filters[11] );
+ $strcalc .= " AND items.location LIKE '" . @$filters[11] ."'";
}
if (@$filters[12]){
@$filters[12]=~ s/\*/%/g;
- $strcalc .= " AND items.stack like '" . @$filters[12] ."'" if ( @$filters[12] );
+ $strcalc .= " AND items.ccode LIKE '" . @$filters[12] ."'";
}
+
$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
- warn "". $strcalc;
+ $debug and warn "SQL: $strcalc";
my $dbcalc = $dbh->prepare($strcalc);
-# $dbcalc->execute;
+ $dbcalc->execute($barcodefilter);
# warn "filling table";
my $emptycol;
while (my ($row, $col, $value) = $dbcalc->fetchrow) {
# warn "filling table $row / $col / $value ";
- $emptycol = 1 if ($col eq undef);
- $col = "zzEMPTY" if ($col eq undef);
- $row = "zzEMPTY" if ($row eq undef);
+ $emptycol = 1 if (!defined($col));
+ $col = "zzEMPTY" if (!defined($col));
+ $row = "zzEMPTY" if (!defined($row));
$table{$row}->{$col}+=$value;
$table{$row}->{totalrow}+=$value;
$grantotal += $value;
}
+# my %cell = {rowtitle => 'zzROWEMPTY'};
+# push @loopline,\%cell;
+# undef %cell;
+# my %cell;
+# %cell = {coltitle => "zzEMPTY"};
push @loopcol,{coltitle => "NULL"} if ($emptycol);
foreach my $row ( sort keys %table ) {
}
push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
'loopcell' => \@loopcell,
- 'hilighted' => ($hilighted >0),
+ 'hilighted' => ($hilighted *= -1 > 0),
'totalrow' => $table{$row}->{totalrow}
};
- $hilighted = -$hilighted;
}
# warn "footer processing";
return \@mainloop;
}
-1;
\ No newline at end of file
+1;