Bug 2505: Added warnings to members/members-home.pl and members/setstatus.pl

[koha_ffzg] / tools / manage-marc-import.pl

diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index c9946f3..ccf4e79 100755 (executable)
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -33,7 +33,8 @@ use C4::Biblio;
 use C4::ImportBatch;
 use C4::Matcher;
 use C4::BackgroundJob;
-use C4::Labels qw(add_batch);  
+use C4::Labels::Batch 1.000000;
+use C4::Branch qw(get_branch_code_from_name);
 
 my $script_name = "/cgi-bin/koha/tools/manage-marc-import.pl";
 
@@ -63,7 +64,16 @@ my $dbh = C4::Context->dbh;
 if ($op eq "create_labels") {
        #create a batch of labels, then lose $op & $import_batch_id so we get back to import batch list.
        my $label_batch_id = create_labelbatch_from_importbatch($import_batch_id);
-       $template->param( label_batch => $label_batch_id );
+        if ($label_batch_id == -1) {
+            $template->param(   label_batch_msg => "Error attempting to create label batch. Please ask your system administrator to check the log for more details.",
+                                message_type    => 'alert',
+            );
+        }
+        else {
+            $template->param(   label_batch_msg => "Label batch #$label_batch_id created.",
+                                message_type    => 'dialog',
+            );
+        }
        $op='';
        $import_batch_id='';
 }
@@ -95,7 +105,12 @@ if ($op eq "") {
     }
     import_biblios_list($template, $import_batch_id, $offset, $results_per_page);
 } elsif ($op eq "clean-batch") {
-    ;
+    CleanBatch($import_batch_id);
+    import_batches_list($template, $offset, $results_per_page);
+    $template->param( 
+        did_clean       => 1,
+        import_batch_id => $import_batch_id,
+    );
 } elsif ($op eq "redo-matching") {
     my $new_matcher_id = $input->param('new_matcher_id');
     my $current_matcher_id = $input->param('current_matcher_id');
@@ -161,9 +176,22 @@ sub redo_matching {
 
 sub create_labelbatch_from_importbatch {
        my ($batch_id) = @_;
+        my $err = undef;
+        my $branch_code = get_branch_code_from_name($template->param('LoginBranchname'));
+        my $batch = C4::Labels::Batch->new(branch_code => $branch_code);
        my @items = GetItemNumbersFromImportBatch($batch_id);
-       my $labelbatch = add_batch('labels',\@items);
-       return $labelbatch; 
+        if (grep{$_ == 0} @items) {
+            warn sprintf('create_labelbatch_from_importbatch() : Call to C4::ImportBatch::GetItemNumbersFromImportBatch returned no item number(s) from import batch #%s.', $batch_id);
+            return -1;
+        }
+        foreach my $item_number (@items) {
+            $err = $batch->add_item($item_number);
+            if ($err == -1) {
+                warn sprintf('create_labelbatch_from_importbatch() : Error attempting to add item #%s of import batch #%s to label batch.', $item_number, $batch_id);
+                return -1;
+            }
+        }
+        return $batch->get_attr('batch_id');
 }
 
 sub import_batches_list {
@@ -179,7 +207,8 @@ sub import_batches_list {
             upload_timestamp => $batch->{'upload_timestamp'},
             import_status => $batch->{'import_status'},
             file_name => $batch->{'file_name'},
-            comments => $batch->{'comments'}
+            comments => $batch->{'comments'},
+            can_clean => ($batch->{'import_status'} ne 'cleaned') ? 1 : 0,
         };
     }
     $template->param(batch_list => \@list); 
@@ -373,6 +402,9 @@ sub batch_info {
     $template->param(upload_timestamp => $batch->{'upload_timestamp'});
     $template->param(num_biblios => $batch->{'num_biblios'});
     $template->param(num_items => $batch->{'num_biblios'});
+    if ($batch->{'import_status'} ne 'cleaned') {
+        $template->param(can_clean => 1);
+    }
     if ($batch->{'num_biblios'} > 0) {
         if ($batch->{'import_status'} eq 'staged' or $batch->{'import_status'} eq 'reverted') {
             $template->param(can_commit => 1);