Bug 17181: Check for duplicate image names when uploading image to patron card creator

[koha.git] / patroncards / create-pdf.pl

diff --git a/patroncards/create-pdf.pl b/patroncards/create-pdf.pl
index 6d352b4..e660af6 100755 (executable)
--- a/patroncards/create-pdf.pl
+++ b/patroncards/create-pdf.pl
@@ -45,8 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
                                                                      flagsrequired   => { tools => 'label_creator' },
                                                                      debug           => 1,
                                                                      });
-
-
 my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
 my $template_id = $cgi->param('template_id') || undef;
 my $layout_id   = $cgi->param('layout_id') || undef;
@@ -58,13 +56,17 @@ my $patronlist_id = $cgi->param('patronlist_id');
 my $items = undef; # items = cards
 my $new_page = 0;
 
-my $pdf_file = (@label_ids || @borrower_numbers ? "card_single_" . scalar(@label_ids || @borrower_numbers) : "card_batch_$batch_id");
-print $cgi->header( -type       => 'application/pdf',
-                    -encoding   => 'utf-8',
-                    -attachment => "$pdf_file.pdf",
-                  );
+# Wrap pdf creation part into an eval, some vars need scope outside eval
+my $pdf_ok;
+my $pdf;
+my $pdf_file;
+my $cardscount = 0;
+
+#Note fo bug 14138: Indenting follows in separate patch to ease review
+eval {
+$pdf_file = (@label_ids || @borrower_numbers ? "card_single_" . scalar(@label_ids || @borrower_numbers) : "card_batch_$batch_id");
 
-my $pdf = C4::Creators::PDF->new(InitVars => 0);
+$pdf = C4::Creators::PDF->new(InitVars => 0);
 my $batch = C4::Patroncards::Batch->retrieve(batch_id => $batch_id);
 my $pc_template = C4::Patroncards::Template->retrieve(template_id => $template_id, profile_id => 1);
 my $layout = C4::Patroncards::Layout->retrieve(layout_id => $layout_id);
@@ -125,6 +127,7 @@ if ($layout_xml->{'page_side'} eq 'B') { # rearrange items on backside of page t
 CARD_ITEMS:
 foreach my $item (@{$items}) {
     if ($item) {
+        $cardscount ++;
         my $borrower_number = $item->{'borrower_number'};
         my $card_number = GetMember(borrowernumber => $borrower_number)->{'cardnumber'};
 
@@ -158,7 +161,12 @@ foreach my $item (@{$items}) {
                 }
                 elsif ($images->{$_}->{'data_source'}->[0]->{'image_source'} eq 'patronimages') {
                     my $patron_image = Koha::Patron::Images->find($borrower_number);
-                    warn sprintf('No image exists for borrower number %s.', $borrower_number) unless $patron_image;
+                    if ($patron_image) {
+                        $image_data->{'imagefile'} = $patron_image->imagefile;
+                    }
+                    else {
+                        warn sprintf('No image exists for borrower number %s.', $borrower_number);
+                    }
                     next PROCESS_IMAGES unless $patron_image;
                 }
                 elsif ($images->{$_}->{'data_source'}->[0]->{'image_source'} eq 'creator_images') {
@@ -226,9 +234,29 @@ foreach my $item (@{$items}) {
     ($llx, $lly, $new_page) = $pc_template->get_next_label_pos();
     $pdf->Page() if $new_page;
 }
+# No errors occurred within eval, we can issue the pdf
+$pdf_ok = 1 if ($cardscount > 0);
+}; # end of eval block
 
-$pdf->End();
-
-# FIXME: Possibly do a redirect here if there were error encountered during PDF creation.
+if ($pdf_ok) {
+    #issue the pdf
+    print $cgi->header( -type       => 'application/pdf',
+                    -encoding   => 'utf-8',
+                    -attachment => "$pdf_file.pdf",
+                  );
+    $pdf->End();
+}
+else {
+    # warn user that pdf is not created
+    my $errparams = '&pdferr=1';
+    $errparams .= "&errba=$batch_id" if $batch_id;
+    $errparams .= "&errpl=$patronlist_id" if $patronlist_id;
+    $errparams =  $errparams.'&errpt='.$cgi->param('borrower_number') if $cgi->param('borrower_number');
+    $errparams .= "&errlo=$layout_id" if $layout_id;
+    $errparams .= "&errtpl=$template_id" if $template_id;
+    $errparams .= "&errnocards=1" if !$cardscount;
+
+    print $cgi->redirect("/cgi-bin/koha/patroncards/manage.pl?card_element=batch$errparams");
+}
 
 1;