X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=tools%2Fmanage-marc-import.pl;h=df4da462d9a43fcc9cb23d75cddc2ad67feb9c43;hb=2e0837d7346c2d59800056997c9beb44529b4800;hp=9f93266cba9a46a752d1c59bf6096945dafed775;hpb=760ce0b18c51ee927fe1d64f70875612542d02da;p=koha.git

diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index 9f93266cba..df4da462d9 100755
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -18,6 +18,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
 
 # standard or CPAN modules used
 use CGI;
@@ -33,14 +34,15 @@ use C4::Biblio;
 use C4::ImportBatch;
 use C4::Matcher;
 use C4::BackgroundJob;
+use C4::Labels qw(add_batch);  
 
 my $script_name = "/cgi-bin/koha/tools/manage-marc-import.pl";
 
 my $input = new CGI;
-my $op = $input->param('op');
+my $op = $input->param('op') || '';
 my $completedJobID = $input->param('completedJobID');
 my $runinbackground = $input->param('runinbackground');
-my $import_batch_id = $input->param('import_batch_id');
+my $import_batch_id = $input->param('import_batch_id') || '';
 
 # record list displays
 my $offset = $input->param('offset') || 0;
@@ -51,7 +53,7 @@ my ($template, $loggedinuser, $cookie)
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {parameters => 1},
+                 flagsrequired => {tools => 'manage_staged_marc'},
                  debug => 1,
                  });
 
@@ -74,7 +76,7 @@ if ($op) {
 
 if ($op eq "") {
     # displaying a list
-    if ($import_batch_id eq "") {
+    if ($import_batch_id eq '') {
         import_batches_list($template, $offset, $results_per_page);
     } else {
         import_biblios_list($template, $import_batch_id, $offset, $results_per_page);
@@ -94,11 +96,20 @@ 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');
-    redo_matching($template, $import_batch_id, $new_matcher_id, $current_matcher_id);
+    my $overlay_action = $input->param('overlay_action');
+    my $nomatch_action = $input->param('nomatch_action');
+    my $item_action = $input->param('item_action');
+    redo_matching($template, $import_batch_id, $new_matcher_id, $current_matcher_id, 
+                  $overlay_action, $nomatch_action, $item_action);
     import_biblios_list($template, $import_batch_id, $offset, $results_per_page);
 } 
 
@@ -107,10 +118,34 @@ output_html_with_http_headers $input, $cookie, $template->output;
 exit 0;
 
 sub redo_matching {
-    my ($template, $import_batch_id, $new_matcher_id, $current_matcher_id) = @_;
+    my ($template, $import_batch_id, $new_matcher_id, $current_matcher_id, $overlay_action, $nomatch_action, $item_action) = @_;
     my $rematch_failed = 0;
     return if not defined $new_matcher_id and not defined $current_matcher_id;
-    return if $new_matcher_id == $current_matcher_id;
+    my $old_overlay_action = GetImportBatchOverlayAction($import_batch_id);
+    my $old_nomatch_action = GetImportBatchNoMatchAction($import_batch_id);
+    my $old_item_action = GetImportBatchItemAction($import_batch_id);
+    return if $new_matcher_id eq $current_matcher_id and 
+              $old_overlay_action eq $overlay_action and 
+              $old_nomatch_action eq $nomatch_action and 
+              $old_item_action eq $item_action;
+ 
+    if ($old_overlay_action ne $overlay_action) {
+        SetImportBatchOverlayAction($import_batch_id, $overlay_action);
+        $template->param('changed_overlay_action' => 1);
+    }
+    if ($old_nomatch_action ne $nomatch_action) {
+        SetImportBatchNoMatchAction($import_batch_id, $nomatch_action);
+        $template->param('changed_nomatch_action' => 1);
+    }
+    if ($old_item_action ne $item_action) {
+        SetImportBatchItemAction($import_batch_id, $item_action);
+        $template->param('changed_item_action' => 1);
+    }
+
+    if ($new_matcher_id eq $current_matcher_id) {
+        return;
+    } 
+
     my $num_with_matches = 0;
     if (defined $new_matcher_id and $new_matcher_id ne "") {
         my $matcher = C4::Matcher->fetch($new_matcher_id);
@@ -122,7 +157,8 @@ sub redo_matching {
         }
     } else {
         $num_with_matches = BatchFindBibDuplicates($import_batch_id, undef);
-         SetImportBatchMatcher($import_batch_id, undef);
+        SetImportBatchMatcher($import_batch_id, undef);
+        SetImportBatchOverlayAction('create_new');
     }
     $template->param(rematch_failed => $rematch_failed);
     $template->param(rematch_attempted => 1);
@@ -132,8 +168,8 @@ sub redo_matching {
 sub create_labelbatch_from_importbatch {
 	my ($batch_id) = @_;
 	my @items = GetItemNumbersFromImportBatch($batch_id);
-	warn join("/",@items);
-	return 0; # dummy return until C4::Labels::add_batch() takes an array
+	my $labelbatch = add_batch('labels',\@items);
+	return $labelbatch; 
 }
 
 sub import_batches_list {
@@ -149,7 +185,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); 
@@ -293,17 +330,25 @@ sub import_biblios_list {
         $citation .= ", " if $biblio->{'issn'} and $biblio->{'isbn'};
         $citation .= $biblio->{'issn'} if $biblio->{'issn'};
         $citation .= ")" if $biblio->{'issn'} or $biblio->{'isbn'};
+
         my $match = GetImportRecordMatches($biblio->{'import_record_id'}, 1);
-        push @list, {
-            import_record_id => $biblio->{'import_record_id'},
-            citation => $citation,
-            status => $biblio->{'status'},
-            record_sequence => $biblio->{'record_sequence'},
-            overlay_status => $biblio->{'overlay_status'},
-            match_biblionumber => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0,
-            match_citation => $#$match > -1 ? $match->[0]->{'title'} . ' ' . $match->[0]->{'author'} : '',
-            match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
-        };
+        my $match_citation = '';
+        if ($#$match > -1) {
+            $match_citation .= $match->[0]->{'title'} if defined($match->[0]->{'title'});
+            $match_citation .= ' ' . $match->[0]->{'author'} if defined($match->[0]->{'author'});
+        }
+
+        push @list,
+          { import_record_id         => $biblio->{'import_record_id'},
+            final_match_biblionumber => $biblio->{'matched_biblionumber'},
+            citation                 => $citation,
+            status                   => $biblio->{'status'},
+            record_sequence          => $biblio->{'record_sequence'},
+            overlay_status           => $biblio->{'overlay_status'},
+            match_biblionumber       => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0,
+            match_citation           => $match_citation,
+            match_score              => $#$match > -1 ? $match->[0]->{'score'} : 0,
+          };
     }
     my $num_biblios = $batch->{'num_biblios'};
     $template->param(biblio_list => \@list); 
@@ -313,6 +358,15 @@ sub import_biblios_list {
     $template->param(num_results => $num_biblios);
     $template->param(results_per_page => $results_per_page);
     $template->param(import_batch_id => $import_batch_id);
+    my $overlay_action = GetImportBatchOverlayAction($import_batch_id);
+    $template->param("overlay_action_${overlay_action}" => 1);
+    $template->param(overlay_action => $overlay_action);
+    my $nomatch_action = GetImportBatchNoMatchAction($import_batch_id);
+    $template->param("nomatch_action_${nomatch_action}" => 1);
+    $template->param(nomatch_action => $nomatch_action);
+    my $item_action = GetImportBatchItemAction($import_batch_id);
+    $template->param("item_action_${item_action}" => 1);
+    $template->param(item_action => $item_action);
     batch_info($template, $batch);
     
 }
@@ -326,11 +380,16 @@ 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'} eq 'staged' or $batch->{'import_status'} eq 'reverted') {
-        $template->param(can_commit => 1);
+    if ($batch->{'import_status'} ne 'cleaned') {
+        $template->param(can_clean => 1);
     }
-    if ($batch->{'import_status'} eq 'imported') {
-        $template->param(can_revert => 1);
+    if ($batch->{'num_biblios'} > 0) {
+        if ($batch->{'import_status'} eq 'staged' or $batch->{'import_status'} eq 'reverted') {
+            $template->param(can_commit => 1);
+        }
+        if ($batch->{'import_status'} eq 'imported') {
+            $template->param(can_revert => 1);
+        }
     }
     if (defined $batch->{'matcher_id'}) {
         my $matcher = C4::Matcher->fetch($batch->{'matcher_id'});
@@ -348,7 +407,7 @@ sub add_matcher_list {
     my @matchers = C4::Matcher::GetMatcherList();
     if (defined $current_matcher_id) {
         for (my $i = 0; $i <= $#matchers; $i++) {
-            if ($matchers[$i]->{'matcher_id'} == $current_matcher_id) {
+            if ($matchers[$i]->{'matcher_id'} eq $current_matcher_id) {
                 $matchers[$i]->{'selected'} = 1;
             }
         }