Revert "Portuguese staff updates"

[koha.git] / reports / borrowers_out.pl

diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index c969cc8..ff5e782 100755 (executable)
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -18,12 +18,15 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
+
 use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Koha;
 use C4::Output;
 use C4::Circulation;
+use C4::Reports;
 use C4::Members;
 use C4::Dates qw/format_date_in_iso/;
 
@@ -46,7 +49,8 @@ my @filters = $input->param("Filter");
 my $output = $input->param("output");
 my $basename = $input->param("basename");
 my $mime = $input->param("MIME");
-my $del = $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,
                 query => $input,
@@ -74,8 +78,6 @@ if ($do_it) {
                             -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;
 # Other header
@@ -88,9 +90,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
@@ -122,13 +125,7 @@ if ($do_it) {
                 -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 );
+       my $CGIsepChoice = GetDelimiterChoices;
     
     my ($codes,$labels) = GetborCatFromCatType(undef,undef);
     my @borcatloop;
@@ -178,7 +175,7 @@ sub calculate {
     my $colfield;
     my $colorder;
     if ($column){
-        $column = "borrowers.".$column if $column=~/categorycode/;
+        $column = "borrowers.".$column if $column=~/categorycode/ || $column=~/branchcode/;
         my @colfilter ;
         $colfilter[0] = @$filters[0] if ($column =~ /category/ )  ;
     #  $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ;
@@ -189,14 +186,14 @@ sub calculate {
         $colorder .= $column;
         
         my $strsth2;
-        $strsth2 .= "select distinctrow $colfield FROM borrowers LEFT JOIN `issues` ON issues.borrowernumber=borrowers.borrowernumber";
+        $strsth2 .= "select distinctrow $colfield FROM borrowers LEFT JOIN `old_issues` ON old_issues.borrowernumber=borrowers.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;
@@ -214,16 +211,16 @@ sub calculate {
     
     my $i=0;
 #      my @totalcol;
-    my $hilighted=-1;
     
     #Initialization of cell values.....
     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;
+            }
         }
     }
 
@@ -239,8 +236,8 @@ sub calculate {
     @$filters[0]=~ s/\*/%/g if (@$filters[0]);
     $strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
     if (@$filters[1]){
-        my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues where issues.timestamp> @$filters[1] ";
-        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp> ".format_date_in_iso(@$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]);
@@ -248,9 +245,9 @@ sub calculate {
 #                      $strcalc .= " AND borrowers.borrowernumber <> $borrowernumber ";
 #              }
     } else {
-        my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues ";
-        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues ");
-        $queryfilter->execute;
+        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 ";
@@ -260,11 +257,13 @@ sub calculate {
     $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";
+     } 
+#    warn "SQL :". $strcalc;
     
     my $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
@@ -273,7 +272,7 @@ sub calculate {
     $i=1;
     while (my  @data = $dbcalc->fetchrow) {
         my ($row, $col )=@data;
-        $col = "zzEMPTY" if ($col eq undef);
+        $col = "zzEMPTY" if (!defined($col));
         $i=1 if (($previous_col) and not($col eq $previous_col));
         $table[$i]->{$col}=$row;
 #              warn " $i $col $row";
@@ -300,9 +299,7 @@ sub calculate {
         }
         push @looprow,{ 'rowtitle' => $i ,
                         'loopcell' => \@loopcell,
-                        'hilighted' => ($hilighted >0),
                     };
-        $hilighted = -$hilighted;
     }
     
             
@@ -322,3 +319,4 @@ sub calculate {
 }
 
 1;
+__END__