From 48ee914631cb1ec889db8a15085f3519c20b2b7e Mon Sep 17 00:00:00 2001 From: Daniel Barker Date: Wed, 15 Jan 2014 09:57:19 +1300 Subject: [PATCH] Bug 8168: Fixing header of non CSV files for overdue notices This determines if the CSV header should be included or not and then generates it as needed using the delimiter specified in the delimiter system preference. TEST PLAN --------- 1. make some overdues books 2. run the overdue notices script without the -csv 3. check emails notice csv header is in the email 4. apply the patch 5. run the overdue notice again 6. check email notice CSV header is absent Signed-off-by: Mark Tompsett Signed-off-by: Chris Cormack Signed-off-by: wajasu Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit a31210efd34dc7e3c65f8491c26c2d8f8fc36dfb) Signed-off-by: Fridolin Somers --- misc/cronjobs/overdue_notices.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index 7745047e3f..a489f1f27d 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -627,9 +627,16 @@ END_SQL print @output_chunks; } # Generate the content of the csv with headers - my $content = join(";", qw(title name surname address1 address2 zipcode city country email itemcount itemsinfo due_date issue_date)) . "\n"; + my $content; + if ( defined $csvfilename ) { + my $delimiter = C4::Context->preference('delimiter') // ';'; + $content = join($delimiter, qw(title name surname address1 address2 zipcode city country email itemcount itemsinfo due_date issue_date)) . "\n"; + } + else { + $content = ""; + } $content .= join( "\n", @output_chunks ); - + my $attachment = { filename => defined $csvfilename ? 'attachment.csv' : 'attachment.txt', type => 'text/plain', -- 2.39.5