Attachment 17601 Details for Bug 8687 – patch for master combining the other 2 and adding back the BEGIN

[patch] patch for master combining the other 2 and adding back the BEGIN

0001-Bug-8687-Improvements-in-the-overdue_notices.pl-scri.patch (text/plain), 4.38 KB, created by Maxime Pelletier on 2013-04-22 21:12:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Pelletier

Created: 2013-04-22 21:12:55 UTC

Size: 4.38 KB

patch

obsolete

>From 0ea4f718251cfe5b86295cdb80feca93c941103f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Fr=C3=A9d=C3=A9rick?= <frederick.capovilla@libeo.com>
>Date: Fri, 24 Aug 2012 13:43:51 -0400
>Subject: [PATCH] Bug 8687: Improvements in the overdue_notices.pl script
>
>- UTF-8 support in the HTML output
>- Add the cardnumber and phone columns to the csv output
>
>Patch sponsored by the CCSR ( http://www.ccsr.qc.ca )
>---
> misc/cronjobs/overdue_notices.pl |   15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
>diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
>index 5f285c0..72ae66b 100755
>--- a/misc/cronjobs/overdue_notices.pl
>+++ b/misc/cronjobs/overdue_notices.pl
>@@ -60,7 +60,7 @@ overdue_notices.pl
>    -max          <days>           maximum days overdue to deal with
>    -library      <branchname>     only deal with overdues from this library (repeatable : several libraries can be given)
>    -csv          <filename>       populate CSV file
>-   -html         <filename>       Output html to file
>+   -html         <filedir>        Output html to file directory or to STDOUT if none specified
>    -itemscontent <list of fields> item information in templates
>    -borcat       <categorycode>   category code that must be included
>    -borcatout    <categorycode>   category code that must be excluded
>@@ -362,7 +362,7 @@ if ( defined $csvfilename ) {
>     } else {
>         open $csv_fh, ">", $csvfilename or die "unable to open $csvfilename: $!";
>     }
>-    if ( $csv->combine(qw(name surname address1 address2 zipcode city country email itemcount itemsinfo)) ) {
>+    if ( $csv->combine(qw(name surname address1 address2 zipcode city country email phone cardnumber itemcount itemsinfo)) ) {
>         print $csv_fh $csv->string, "\n";
>     } else {
>         $verbose and warn 'combine failed on argument: ' . $csv->error_input;
>@@ -376,11 +376,13 @@ if ( defined $htmlfilename ) {
>     $html_fh = *STDOUT;
>   } else {
>     my $today = DateTime->now(time_zone => C4::Context->tz );
>-    open $html_fh, ">",File::Spec->catdir ($htmlfilename,"notices-".$today->ymd().".html");
>+    my $htmlfile = File::Spec->catdir ($htmlfilename,"notices-".$today->ymd().".html");
>+    open $html_fh, ">:encoding(UTF-8)", $htmlfile or die "unable to open $htmlfile; $! (Be sure to create the directory)\n";
>   }
>   
>   print $html_fh "<html>\n";
>   print $html_fh "<head>\n";
>+  print $html_fh "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
>   print $html_fh "<style type='text/css'>\n";
>   print $html_fh "pre {page-break-after: always;}\n";
>   print $html_fh "pre {white-space: pre-wrap;}\n";
>@@ -451,7 +453,7 @@ END_SQL
>             # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode> <country>
> 
>             my $borrower_sql = <<'END_SQL';
>-SELECT distinct(issues.borrowernumber), firstname, surname, address, address2, city, zipcode, country, email, emailpro, B_email
>+SELECT distinct(issues.borrowernumber), firstname, surname, address, address2, city, zipcode, country, email, emailpro, B_email, phone, cardnumber
> FROM   issues,borrowers,categories
> WHERE  issues.borrowernumber=borrowers.borrowernumber
> AND    borrowers.categorycode=categories.categorycode
>@@ -595,6 +597,8 @@ END_SQL
>                             country        => $data->{'country'},
>                             email          => $notice_email,
>                             itemcount      => $itemcount,
>+                            phone          => $phone,
>+                            cardnumber     => $cardnumber,
>                             titles         => $titles,
>                             outputformat   => defined $csvfilename ? 'csv' : defined $htmlfilename ? 'html' : '',
>                         }
>@@ -752,7 +756,8 @@ sub prepare_letter_for_printing {
>     if ( exists $params->{'outputformat'} && $params->{'outputformat'} eq 'csv' ) {
>         if ($csv->combine(
>                 $params->{'firstname'}, $params->{'lastname'}, $params->{'address1'},  $params->{'address2'}, $params->{'postcode'},
>-                $params->{'city'}, $params->{'country'}, $params->{'email'}, $params->{'itemcount'}, $params->{'titles'}
>+                $params->{'city'}, $params->{'country'}, $params->{'email'}, $params->{'itemcount'}, $params->{'titles'},
>+                $params->{'phone'}, $params->{'cardnumber'}
>             )
>           ) {
>             return $csv->string, "\n";
>-- 
>1.7.10.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 8687: 11826 | 11829 | 12404 | 12711 | 12712 | 12713 | 17601 | 17941 | 23150 | 23229 | 30403 | 30451 | 30530 | 30538 | 30873 | 30874 | 30875