From 8b3fd04e3503bc5efa41cdcf67db3e2bd1a1a96f Mon Sep 17 00:00:00 2001 From: Paul POULAIN Date: Sat, 1 Mar 2008 06:09:47 +1300 Subject: [PATCH] partial fix for catalogue_out (+ removed tab in indenting) Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../en/modules/reports/catalogue_out.tmpl | 3 +- reports/catalogue_out.pl | 486 +++++++++--------- 2 files changed, 241 insertions(+), 248 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl index 4e56580b25..9af0360c4d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl @@ -37,7 +37,8 @@ - +

">

+ Barcode : diff --git a/reports/catalogue_out.pl b/reports/catalogue_out.pl index 5df3d42407..e1d48148dd 100755 --- a/reports/catalogue_out.pl +++ b/reports/catalogue_out.pl @@ -50,116 +50,116 @@ my $mime = $input->param("MIME"); my $del = $input->param("sep"); #warn "calcul : ".$calc; my ($template, $borrowernumber, $cookie) - = get_template_and_user({template_name => $fullreportname, - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {reports => 1}, - debug => 1, - }); + = get_template_and_user({template_name => $fullreportname, + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {reports => 1}, + debug => 1, + }); $template->param(do_it => $do_it, - ); + ); if ($do_it) { # Displaying results - my $results = calculate($limit, $column, \@filters); - if ($output eq "screen"){ + my $results = calculate($limit, $column, \@filters); + if ($output eq "screen"){ # Printing results to screen - $template->param(mainloop => $results); - output_html_with_http_headers $input, $cookie, $template->output; - exit(1); - } else { + $template->param(mainloop => $results); + output_html_with_http_headers $input, $cookie, $template->output; + exit(1); + } else { # Printing to a csv file - print $input->header(-type => 'application/vnd.sun.xml.calc', - -encoding => 'utf-8', - -attachment=>"$basename.csv", - -filename=>"$basename.csv" ); - my $cols = @$results[0]->{loopcol}; - my $lines = @$results[0]->{looprow}; - my $sep; - $sep =C4::Context->preference("delimiter"); + print $input->header(-type => 'application/vnd.sun.xml.calc', + -encoding => 'utf-8', + -attachment=>"$basename.csv", + -filename=>"$basename.csv" ); + my $cols = @$results[0]->{loopcol}; + my $lines = @$results[0]->{looprow}; + my $sep; + $sep =C4::Context->preference("delimiter"); # header top-right - print "num /". @$results[0]->{column} .$sep; + print "num /". @$results[0]->{column} .$sep; # Other header - foreach my $col ( @$cols ) { - print $col->{coltitle}.$sep; - } - print "Total\n"; + foreach my $col ( @$cols ) { + print $col->{coltitle}.$sep; + } + print "Total\n"; # Table - foreach my $line ( @$lines ) { - my $x = $line->{loopcell}; - print $line->{rowtitle}.$sep; - foreach my $cell (@$x) { - print $cell->{value}.$sep; - } - print $line->{totalrow}; - print "\n"; - } + foreach my $line ( @$lines ) { + my $x = $line->{loopcell}; + print $line->{rowtitle}.$sep; + foreach my $cell (@$x) { + print $cell->{value}.$sep; + } + print $line->{totalrow}; + print "\n"; + } # footer - print "TOTAL"; - $cols = @$results[0]->{loopfooter}; - foreach my $col ( @$cols ) { - print $sep.$col->{totalcol}; - } - print $sep.@$results[0]->{total}; - exit(1); - } + print "TOTAL"; + $cols = @$results[0]->{loopfooter}; + foreach my $col ( @$cols ) { + print $sep.$col->{totalcol}; + } + print $sep.@$results[0]->{total}; + exit(1); + } # Displaying choices } else { - my $dbh = C4::Context->dbh; - my @values; - my %labels; - my %select; - my $req; - - my @mime = ( C4::Context->preference("MIME") ); + my $dbh = C4::Context->dbh; + my @values; + my %labels; + my %select; + my $req; + + my @mime = ( C4::Context->preference("MIME") ); # foreach my $mime (@mime){ # warn "".$mime; # } - - my $CGIextChoice=CGI::scrolling_list( - -name => 'MIME', - -id => 'MIME', - -values => \@mime, - -size => 1, - -multiple => 0 ); - - my @dels = ( C4::Context->preference("delimiter") ); - my $CGIsepChoice=CGI::scrolling_list( - -name => 'sep', - -id => 'sep', - -values => \@dels, - -size => 1, - -multiple => 0 ); - #doctype - my $itemtypes = GetItemTypes; - my @itemtypeloop; - foreach my $thisitemtype (keys %$itemtypes) { + + my $CGIextChoice=CGI::scrolling_list( + -name => 'MIME', + -id => 'MIME', + -values => \@mime, + -size => 1, + -multiple => 0 ); + + my @dels = ( C4::Context->preference("delimiter") ); + my $CGIsepChoice=CGI::scrolling_list( + -name => 'sep', + -id => 'sep', + -values => \@dels, + -size => 1, + -multiple => 0 ); + #doctype + my $itemtypes = GetItemTypes; + my @itemtypeloop; + foreach my $thisitemtype (keys %$itemtypes) { # my $selected = 1 if $thisbranch eq $branch; - my %row =(value => $thisitemtype, + my %row =(value => $thisitemtype, # selected => $selected, - description => $itemtypes->{$thisitemtype}->{'description'}, - ); - push @itemtypeloop, \%row; - } - - #branch - my $branches = GetBranches; - my @branchloop; - foreach my $thisbranch (keys %$branches) { + description => $itemtypes->{$thisitemtype}->{'description'}, + ); + push @itemtypeloop, \%row; + } + + #branch + my $branches = GetBranches; + my @branchloop; + foreach my $thisbranch (keys %$branches) { # my $selected = 1 if $thisbranch eq $branch; - my %row =(value => $thisbranch, + my %row =(value => $thisbranch, # selected => $selected, - branchname => $branches->{$thisbranch}->{'branchname'}, - ); - push @branchloop, \%row; - } - - $template->param( - CGIextChoice => $CGIextChoice, - CGIsepChoice => $CGIsepChoice, - itemtypeloop =>\@itemtypeloop, - branchloop =>\@branchloop, - ); + branchname => $branches->{$thisbranch}->{'branchname'}, + ); + push @branchloop, \%row; + } + + $template->param( + CGIextChoice => $CGIextChoice, + CGIsepChoice => $CGIsepChoice, + itemtypeloop =>\@itemtypeloop, + branchloop =>\@branchloop, + ); output_html_with_http_headers $input, $cookie, $template->output; } @@ -167,178 +167,170 @@ output_html_with_http_headers $input, $cookie, $template->output; sub calculate { - my ($line, $column, $filters) = @_; - my @mainloop; - my @loopfooter; - my @loopcol; - my @loopline; - my @looprow; - my %globalline; - my $grantotal =0; + my ($line, $column, $filters) = @_; + my @mainloop; + my @loopfooter; + my @loopcol; + my @loopline; + my @looprow; + my %globalline; + my $grantotal =0; # extract parameters - my $dbh = C4::Context->dbh; + my $dbh = C4::Context->dbh; # Filters # Checking filters # - my @loopfilter; - for (my $i=0;$i<=6;$i++) { - my %cell; - if ( @$filters[$i] ) { - if (($i==1) and (@$filters[$i-1])) { - $cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ; - } - $cell{filter} .= @$filters[$i]; - $cell{crit} .="Branch" if ($i==0); - $cell{crit} .="Doc Type" if ($i==1); - push @loopfilter, \%cell; - } - } - my $colfield; - my $colorder; - if ($column){ - $column = "issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/)); - $column = "biblioitems.".$column if $column=~/itemtype/; - $column = "borrowers.".$column if $column=~/categorycode/; - my @colfilter ; - $colfilter[0] = @$filters[0] if ($column =~ /branch/ ) ; - $colfilter[0] = @$filters[1] if ($column =~ /itemtype/ ) ; - - # loop cols. - $colfield .= $column; - $colorder .= $column; - - my $strsth2; - $strsth2 .= "select distinctrow $colfield FROM `issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null"; - if ($colfilter[0]) { - $colfilter[0] =~ s/\*/%/g; - $strsth2 .= " and $column LIKE '$colfilter[0]' " ; - } - $strsth2 .=" group by $colfield"; - $strsth2 .=" order by $colorder"; - warn "". $strsth2; - - my $sth2 = $dbh->prepare( $strsth2 ); - $sth2->execute; + my @loopfilter; + for (my $i=0;$i<=6;$i++) { + my %cell; + if ( @$filters[$i] ) { + if (($i==1) and (@$filters[$i-1])) { + $cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ; + } + $cell{filter} .= @$filters[$i]; + $cell{crit} .="Branch" if ($i==0); + $cell{crit} .="Doc Type" if ($i==1); + push @loopfilter, \%cell; + } + } + my $colfield; + my $colorder; + if ($column){ + $column = "issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/)); + $column = "biblioitems.".$column if $column=~/itemtype/; + $column = "borrowers.".$column if $column=~/categorycode/; + my @colfilter ; + $colfilter[0] = @$filters[0] if ($column =~ /branch/ ) ; + $colfilter[0] = @$filters[1] if ($column =~ /itemtype/ ) ; + + # loop cols. + $colfield .= $column; + $colorder .= $column; + + my $strsth2; + $strsth2 .= "select distinctrow $colfield FROM `issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null"; + if ($colfilter[0]) { + $colfilter[0] =~ s/\*/%/g; + $strsth2 .= " and $column LIKE '$colfilter[0]' " ; + } + $strsth2 .=" group by $colfield"; + $strsth2 .=" order by $colorder"; + warn "". $strsth2; + + my $sth2 = $dbh->prepare( $strsth2 ); + $sth2->execute; - - - while (my ($celvalue) = $sth2->fetchrow) { - my %cell; - # my %ft; - # warn "coltitle :".$celvalue; - $cell{coltitle} = $celvalue; - # $ft{totalcol} = 0; - push @loopcol, \%cell; - } - # warn "fin des titres colonnes"; - } - - my $i=0; + + + while (my ($celvalue) = $sth2->fetchrow) { + my %cell; + # my %ft; + # warn "coltitle :".$celvalue; + $cell{coltitle} = $celvalue; + # $ft{totalcol} = 0; + push @loopcol, \%cell; + } + # warn "fin des titres colonnes"; + } + + my $i=0; # my @totalcol; - my $hilighted=-1; - - #Initialization of cell values..... - my @table; - + my $hilighted=-1; + + #Initialization of cell values..... + my @table; + # warn "init table"; - for (my $i=1;$i<=$line;$i++) { - foreach my $col ( @loopcol ) { + for (my $i=1;$i<=$line;$i++) { + foreach my $col ( @loopcol ) { # warn " init table : $row->{rowtitle} / $col->{coltitle} "; - $table[$i]->{($col->{coltitle})?$col->{coltitle}:"Global"}=0; - } - } + $table[$i]->{($col->{coltitle})?$col->{coltitle}:"Global"}=0; + } + } # preparing calculation - my $strcalc ; - + my $strcalc ; + # Processing average loanperiods - $strcalc .= "SELECT items.barcode, biblio.title, biblio.biblionumber, biblio.author"; - $strcalc .= " , $colfield " if ($colfield); - $strcalc .= " FROM (items LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber LEFT JOIN biblio ON biblio.biblionumber=items.biblionumber) LEFT JOIN issues ON issues.itemnumber=items.itemnumber WHERE issues.itemnumber is null"; -# @$filters[0]=~ s/\*/%/g if (@$filters[0]); -# $strcalc .= " AND issues.timestamp <= '" . @$filters[0] ."'" if ( @$filters[0] ); -# @$filters[1]=~ s/\*/%/g if (@$filters[1]); -# $strcalc .= " AND issues.timestamp >= '" . @$filters[1] ."'" if ( @$filters[1] ); -# @$filters[2]=~ s/\*/%/g if (@$filters[2]); -# $strcalc .= " AND issues.returndate <= '" . @$filters[2] ."'" if ( @$filters[2] ); -# @$filters[3]=~ s/\*/%/g if (@$filters[3]); -# $strcalc .= " AND issues.returndate >= '" . @$filters[3] ."'" if ( @$filters[3] ); - @$filters[0]=~ s/\*/%/g if (@$filters[0]); - $strcalc .= " AND items.homebranch like '" . @$filters[0] ."'" if ( @$filters[0] ); - @$filters[1]=~ s/\*/%/g if (@$filters[1]); - $strcalc .= " AND biblioitems.itemtype like '" . @$filters[1] ."'" if ( @$filters[1] ); - - $strcalc .= " group by items.itemnumber"; - $strcalc .= ", $colfield" if ($column); - $strcalc .= " order by $colfield " if ($colfield); - my $max = (@loopcol) ? $line*@loopcol : $line ; - $strcalc .= " LIMIT 0,$max" if ($line); - warn "SQL :". $strcalc; - - my $dbcalc = $dbh->prepare($strcalc); - $dbcalc->execute; + $strcalc .= "SELECT items.barcode, biblio.title, biblio.biblionumber, biblio.author"; + $strcalc .= " , $colfield " if ($colfield); + $strcalc .= " FROM (items LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber LEFT JOIN biblio ON biblio.biblionumber=items.biblionumber) LEFT JOIN issues ON issues.itemnumber=items.itemnumber WHERE issues.itemnumber is null"; + @$filters[0]=~ s/\*/%/g if (@$filters[0]); + $strcalc .= " AND items.homebranch like '" . @$filters[0] ."'" if ( @$filters[0] ); + @$filters[1]=~ s/\*/%/g if (@$filters[1]); + $strcalc .= " AND biblioitems.itemtype like '" . @$filters[1] ."'" if ( @$filters[1] ); + + $strcalc .= " group by items.itemnumber"; + $strcalc .= ", $colfield" if ($column); + $strcalc .= " order by $colfield " if ($colfield); + my $max = (@loopcol) ? $line*@loopcol : $line ; + $strcalc .= " LIMIT 0,$max" if ($line); + warn "SQL :". $strcalc; + + my $dbcalc = $dbh->prepare($strcalc); + $dbcalc->execute; # warn "filling table"; - my $previous_col; - $i=1; - while (my @data = $dbcalc->fetchrow) { - my ($barcode,$title,$bibnum,$author, $col )=@data; - $col = "zzEMPTY" if ($col eq undef); - $i=1 if (($previous_col) and not($col eq $previous_col)); - $table[$i]->{$col}->{'barcode'}=$barcode; - $table[$i]->{$col}->{'title'}=$title; - $table[$i]->{$col}->{'bibnum'}=$bibnum; - $table[$i]->{$col}->{'author'}=$author; + my $previous_col; + $i=1; + while (my @data = $dbcalc->fetchrow) { + my ($barcode,$title,$biblionumber,$author, $col )=@data; + $col = "zzEMPTY" if ($col eq undef); + $i=1 if (($previous_col) and not($col eq $previous_col)); + $table[$i]->{$col}->{'barcode'}=$barcode; + $table[$i]->{$col}->{'title'}=$title; + $table[$i]->{$col}->{'biblionumber'}=$biblionumber; + $table[$i]->{$col}->{'author'}=$author; # warn " ".$i." ".$col. " ".$row; - $i++; - $previous_col=$col; - } - - push @loopcol,{coltitle => "Global"} if not($column); - - $max =(($line)?$line:@table); - for ($i=1; $i<$max;$i++) { - my @loopcell; - #@loopcol ensures the order for columns is common with column titles - # and the number matches the number of columns - my $colcount=0; - foreach my $col ( @loopcol ) { - my ($barcode, $author, $title, $bibnum); - if (@loopcol){ - $barcode =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'barcode'}; - $title =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'title'}; - $author =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'author'}; - $bibnum =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'bibnum'}; - } else { - $barcode =$table[$i]->{"zzEMPTY"}->{'barcode'}; - $title =$table[$i]->{"zzEMPTY"}->{'title'}; - $author =$table[$i]->{"zzEMPTY"}->{'author'}; - $bibnum =$table[$i]->{"zzEMPTY"}->{'bibnum'}; - } - push @loopcell, {author=> $author, title=>$title,bibnum=>$bibnum,barcode=>$barcode} ; - } - push @looprow,{ 'rowtitle' => $i , - 'loopcell' => \@loopcell, - 'hilighted' => ($hilighted >0), - }; - $hilighted = -$hilighted; - } - - + $i++; + $previous_col=$col; + } + + push @loopcol,{coltitle => "Global"} if not($column); + + $max =(($line)?$line:@table); + for ($i=1; $i<=$max;$i++) { + my @loopcell; + #@loopcol ensures the order for columns is common with column titles + # and the number matches the number of columns + my $colcount=0; + foreach my $col ( @loopcol ) { + my ($barcode, $author, $title, $biblionumber); + if (@loopcol){ + $barcode =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'barcode'}; + $title =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'title'}; + $author =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'author'}; + $biblionumber =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'biblionumber'}; + } else { + $barcode =$table[$i]->{"zzEMPTY"}->{'barcode'}; + $title =$table[$i]->{"zzEMPTY"}->{'title'}; + $author =$table[$i]->{"zzEMPTY"}->{'author'}; + $biblionumber =$table[$i]->{"zzEMPTY"}->{'biblionumber'}; + } + push @loopcell, {author=> $author, title=>$title,biblionumber=>$biblionumber,barcode=>$barcode} ; + } + push @looprow,{ 'rowtitle' => $i , + 'loopcell' => \@loopcell, + 'hilighted' => ($hilighted >0), + }; + $hilighted = -$hilighted; + } + + - # the header of the table - $globalline{loopfilter}=\@loopfilter; - # the core of the table - $globalline{looprow} = \@looprow; - $globalline{loopcol} = \@loopcol; + # the header of the table + $globalline{loopfilter}=\@loopfilter; + # the core of the table + $globalline{looprow} = \@looprow; + $globalline{loopcol} = \@loopcol; # # the foot (totals by borrower type) - $globalline{loopfooter} = \@loopfooter; - $globalline{total}= $grantotal; - $globalline{line} = $line; - $globalline{column} = $column; - push @mainloop,\%globalline; - return \@mainloop; + $globalline{loopfooter} = \@loopfooter; + $globalline{total}= $grantotal; + $globalline{line} = $line; + $globalline{column} = $column; + push @mainloop,\%globalline; + return \@mainloop; } 1; -- 2.39.2