MT2116: Addons to the CSV export

[koha.git] / circ / overdue.pl

diff --git a/circ/overdue.pl b/circ/overdue.pl
index 2360028..aab7bdd 100755 (executable)
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -114,8 +114,10 @@ $bornamefilter =~s/\*/\%/g;
 $bornamefilter =~s/\?/\_/g;
 
 my $strsth="SELECT date_due,
-  concat(surname,' ', firstname) as borrower, 
-  borrowers.address,
+  surname,
+  firstname,
+  borrowers.title as borrowertitle,
+  CONCAT(borrowers.address, '\n', borrowers.address2) as address,
   borrowers.city,
   borrowers.zipcode,
   borrowers.phone,
@@ -143,11 +145,11 @@ $strsth.=" AND biblioitems.itemtype   = '" . $itemtypefilter . "' " if $itemtype
 $strsth.=" AND borrowers.flags        = '" . $borflagsfilter . "' " if $borflagsfilter;
 $strsth.=" AND borrowers.branchcode   = '" . $branchfilter   . "' " if $branchfilter;
 $strsth.=" ORDER BY " . (
-    ($order eq "borrower" or $order eq "borrower desc") ? "$order, date_due"                 : 
-    ($order eq "title"    or $order eq    "title desc") ? "$order, date_due, borrower"       :
-    ($order eq "barcode"  or $order eq  "barcode desc") ? "items.$order, date_due, borrower" :
-                            ($order eq "date_due desc") ? "date_due DESC, borrower"          :
-                                                          "date_due, borrower"  # default sort order
+    ($order eq "surname" or $order eq "surname desc") ? "$order, date_due"                 : 
+    ($order eq "title"    or $order eq    "title desc") ? "$order, date_due, surname"       :
+    ($order eq "barcode"  or $order eq  "barcode desc") ? "items.$order, date_due, surname" :
+                            ($order eq "date_due desc") ? "date_due DESC, surname"          :
+                                                          "date_due, surname"  # default sort order
 );
 $template->param(sql=>$strsth);
 my $sth=$dbh->prepare($strsth);
@@ -159,11 +161,13 @@ while (my $data=$sth->fetchrow_hashref) {
     push @overduedata, {
         issuedate      => format_date($data->{issuedate}),
         duedate        => format_date($data->{date_due}),
+        surname        => $data->{surname},
+        firstname      => $data->{firstname},
+        borrowertitle  => $data->{borrowertitle},
         borrowernumber => $data->{borrowernumber},
         barcode        => $data->{barcode},
         itemnum        => $data->{itemnumber},
         itemcallnumber => $data->{itemcallnumber},
-        name           => $data->{borrower},
         address        => $data->{address},
         city           => $data->{city},
         zipcode        => $data->{zipcode},
@@ -206,6 +210,7 @@ sub build_csv {
     # build header ...
     my @keys = sort keys %{ $overdues->[0] };
     my $csv = Text::CSV_XS->new({
+        binary   => 1,
         sep_char => C4::Context->preference("delimiter") ? 
                     C4::Context->preference("delimiter") : ';' ,
     });