1110 : Balance carts and lists, follow-up : Added Opac lists features to admin lists

[koha.git] / reports / borrowers_out.pl

diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index 2bd831b..e16166f 100755 (executable)
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -18,6 +18,8 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
+
 use CGI;
 use C4::Auth;
 use C4::Context;
@@ -44,10 +46,11 @@ my $fullreportname = "reports/borrowers_out.tmpl";
 my $limit = $input->param("Limit");
 my $column = $input->param("Criteria");
 my @filters = $input->param("Filter");
+$filters[1] = format_date_in_iso($filters[1]) if $filters[1];
 my $output = $input->param("output");
 my $basename = $input->param("basename");
 my $mime = $input->param("MIME");
-our $sep     = $input->param("sep");
+our $sep     = $input->param("sep") || '';
 $sep = "\t" if ($sep eq 'tabulation');
 my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
@@ -88,9 +91,10 @@ if ($do_it) {
             my $x = $line->{loopcell};
             print $line->{rowtitle}.$sep;
             foreach my $cell (@$x) {
-                print $cell->{value}.$sep;
+                my $cellvalue = defined $cell->{value} ? $cell->{value}.$sep : ''.$sep;
+                print $cellvalue;
             }
-            print $line->{totalrow};
+#            print $line->{totalrow};
             print "\n";
         }
 # footer
@@ -183,18 +187,17 @@ sub calculate {
         $colorder .= $column;
         
         my $strsth2;
-        $strsth2 .= "select distinctrow $colfield FROM borrowers LEFT JOIN `old_issues` ON old_issues.borrowernumber=borrowers.borrowernumber";
+        $strsth2 .= "select distinctrow $colfield FROM borrowers LEFT JOIN `old_issues` USING(borrowernumber)";
         if ($colfilter[0]) {
             $colfilter[0] =~ s/\*/%/g;
             $strsth2 .= " and $column LIKE '$colfilter[0]' " ;
         }
         $strsth2 .=" group by $colfield";
         $strsth2 .=" order by $colorder";
-        warn "". $strsth2;
+        # warn "". $strsth2;
         
         my $sth2 = $dbh->prepare( $strsth2 );
         $sth2->execute;
-
         while (my ($celvalue) = $sth2->fetchrow) {
             my %cell;
     #          my %ft;
@@ -213,10 +216,11 @@ sub calculate {
     my @table;
     
 #      warn "init table";
-    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;
+    if($line) {
+        for (my $i=1;$i<=$line;$i++) {
+            foreach my $col ( @loopcol ) {
+                $table[$i]->{($col->{coltitle})?$col->{coltitle}:"Global"}=0;
+            }
         }
     }
 
@@ -231,33 +235,21 @@ sub calculate {
     $strcalc .= "WHERE 1 ";
     @$filters[0]=~ s/\*/%/g if (@$filters[0]);
     $strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
+    my $strqueryfilter = "SELECT DISTINCT borrowernumber FROM old_issues WHERE borrowernumber IS NOT NULL ";
     if (@$filters[1]){
-        my $strqueryfilter="SELECT DISTINCT borrowernumber FROM old_issues where old_issues.timestamp> @$filters[1] ";
-#        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM old_issues where old_issues.timestamp> ".format_date_in_iso(@$filters[1]));
-        $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
-        
-#              $queryfilter->execute(@$filters[1]);
-#              while (my ($borrowernumber)=$queryfilter->fetchrow){
-#                      $strcalc .= " AND borrowers.borrowernumber <> $borrowernumber ";
-#              }
-    } else {
-        my $strqueryfilter="SELECT DISTINCT borrowernumber FROM old_issues ";
-#        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM old_issues ");
-#        $queryfilter->execute;
-        $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
-#              while (my ($borrowernumber)=$queryfilter->fetchrow){
-#                      $strcalc .= " AND borrowers.borrowernumber <> $borrowernumber ";
-#              }
+        my $strqueryfilter .= "AND old_issues.timestamp> @$filters[1] ";
     }
+    $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
     $strcalc .= " group by borrowers.borrowernumber";
     $strcalc .= ", $colfield" if ($column);
     $strcalc .= " order by $colfield " if ($colfield);
     my $max;
-    if (@loopcol) {
-        $max = $line*@loopcol;
-    } else { $max=$line;}
-    $strcalc .= " LIMIT 0,$max" if ($line);
-    warn "SQL :". $strcalc;
+    if ($line) {
+        if (@loopcol) {
+            $max = $line*@loopcol;
+        } else { $max=$line;}
+        $strcalc .= " LIMIT 0,$max";
+     } 
     
     my $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
@@ -313,3 +305,4 @@ sub calculate {
 }
 
 1;
+__END__