projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 11292 - barcode scanner clicking 'save'
[koha_fer]
/
misc
/
cronjobs
/
gather_print_notices.pl
diff --git
a/misc/cronjobs/gather_print_notices.pl
b/misc/cronjobs/gather_print_notices.pl
index
286b035
..
248716e
100755
(executable)
--- a/
misc/cronjobs/gather_print_notices.pl
+++ b/
misc/cronjobs/gather_print_notices.pl
@@
-59,9
+59,9
@@
usage(0) if ($help);
my $output_directory = $ARGV[0];
my $output_directory = $ARGV[0];
-if ( !$output_directory || !-d $output_directory ) {
+if ( !$output_directory || !-d $output_directory
|| !-w $output_directory
) {
print STDERR
print STDERR
-"Error: You must specify a valid directory to dump the print notices in.\n";
+"Error: You must specify a valid
and writeable
directory to dump the print notices in.\n";
usage(1);
}
usage(1);
}
@@
-69,6
+69,14
@@
my $today = C4::Dates->new();
my @all_messages = @{ GetPrintMessages() };
exit unless (@all_messages);
my @all_messages = @{ GetPrintMessages() };
exit unless (@all_messages);
+## carriage return replaced by <br/> as output is html
+foreach my $message (@all_messages) {
+ local $_ = $message->{'content'};
+ s/\n/<br \/>/g;
+ s/\r//g;
+ $message->{'content'} = $_;
+}
+
my $OUTPUT;
if ($split) {
my $OUTPUT;
if ($split) {
@@
-79,9
+87,10
@@
if ($split) {
foreach my $branchcode ( keys %messages_by_branch ) {
my @messages = @{ $messages_by_branch{$branchcode} };
foreach my $branchcode ( keys %messages_by_branch ) {
my @messages = @{ $messages_by_branch{$branchcode} };
- open $OUTPUT, '>',
- File::Spec->catdir( $output_directory,
+ my $output_file = File::Spec->catdir( $output_directory,
"holdnotices-" . $today->output('iso') . "-$branchcode.html" );
"holdnotices-" . $today->output('iso') . "-$branchcode.html" );
+ open $OUTPUT, '>', $output_file
+ or die "Could not open $output_file: $!";
my $template =
C4::Templates::gettemplate( 'batch/print-notices.tmpl', 'intranet',
my $template =
C4::Templates::gettemplate( 'batch/print-notices.tmpl', 'intranet',
@@
-104,9
+113,11
@@
if ($split) {
}
}
else {
}
}
else {
- open $OUTPUT, '>',
- File::Spec->catdir( $output_directory,
+ my $output_file = File::Spec->catdir( $output_directory,
"holdnotices-" . $today->output('iso') . ".html" );
"holdnotices-" . $today->output('iso') . ".html" );
+ open $OUTPUT, '>', $output_file
+ or die "Could not open $output_file: $!";
+
my $template =
C4::Templates::gettemplate( 'batch/print-notices.tmpl', 'intranet',
my $template =
C4::Templates::gettemplate( 'batch/print-notices.tmpl', 'intranet',