X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2Fmanage-marc-import.pl;h=cc22aeb9a43eb86013a199ddf6beed8d25893f39;hb=15c8a453fc938410c66e3c0074f55da22395c560;hp=eaf9815adaeb5d18825a1bc81e4d001254fac884;hpb=438ed2333787a37101ce5476dbd656005ab17537;p=koha_fer

diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index eaf9815ada..cc22aeb9a4 100755
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -13,11 +13,12 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+use warnings;
 
 # standard or CPAN modules used
 use CGI;
@@ -26,22 +27,23 @@ use MARC::File::USMARC;
 
 # Koha modules used
 use C4::Context;
+use C4::Koha;
 use C4::Auth;
-use C4::Input;
 use C4::Output;
 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";
 
 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');
+our $runinbackground = $input->param('runinbackground');
+my $import_batch_id = $input->param('import_batch_id') || '';
 
 # record list displays
 my $offset = $input->param('offset') || 0;
@@ -58,12 +60,31 @@ my ($template, $loggedinuser, $cookie)
 
 my %cookies = parse CGI::Cookie($cookie);
 my $sessionID = $cookies{'CGISESSID'}->value;
-my $dbh = C4::Context->dbh;
+our $dbh = C4::Context->dbh;
+
+# Frameworks selection loop
+{
+    my $frameworks = getframeworks;
+    my $arrayref = [];
+    while ( my ($key, $value) = each %$frameworks ) {
+        push @$arrayref, { value => $key, label => $value->{frameworktext} };
+    }
+    $template->param( frameworks => $arrayref );
+}
 
 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='';
 }
@@ -75,7 +96,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);
@@ -84,7 +105,8 @@ if ($op eq "") {
     if ($completedJobID) {
         add_saved_job_results_to_template($template, $completedJobID);
     } else {
-        commit_batch($template, $import_batch_id);
+        my $framework = $input->param('framework');
+        commit_batch($template, $import_batch_id, $framework);
     }
     import_biblios_list($template, $import_batch_id, $offset, $results_per_page);
 } elsif ($op eq "revert-batch") {
@@ -95,7 +117,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');
@@ -118,7 +145,7 @@ sub redo_matching {
     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 == $current_matcher_id and 
+    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;
@@ -136,7 +163,7 @@ sub redo_matching {
         $template->param('changed_item_action' => 1);
     }
 
-    if ($new_matcher_id == $current_matcher_id) {
+    if ($new_matcher_id eq $current_matcher_id) {
         return;
     } 
 
@@ -161,9 +188,22 @@ sub redo_matching {
 
 sub create_labelbatch_from_importbatch {
 	my ($batch_id) = @_;
+        my $err = undef;
+        my $branch_code = C4::Context->userenv->{'branch'};
+        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 +219,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); 
@@ -193,7 +234,7 @@ sub import_batches_list {
 }
 
 sub commit_batch {
-    my ($template, $import_batch_id) = @_;
+    my ($template, $import_batch_id, $framework) = @_;
 
     my $job = undef;
     $dbh->{AutoCommit} = 0;
@@ -203,7 +244,7 @@ sub commit_batch {
         $callback = progress_callback($job, $dbh);
     }
     my ($num_added, $num_updated, $num_items_added, $num_items_errored, $num_ignored) = 
-        BatchCommitBibRecords($import_batch_id, 50, $callback);
+        BatchCommitBibRecords($import_batch_id, $framework, 50, $callback);
     $dbh->commit();
 
     my $results = {
@@ -269,7 +310,7 @@ sub put_in_background {
 
         my $reply = CGI->new("");
         print $reply->header(-type => 'text/html');
-        print "{ jobID: '$jobID' }";
+        print '{"jobID":"' . $jobID . '"}';
         exit 0;
     } elsif (defined $pid) {
         # child
@@ -323,17 +364,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); 
@@ -365,11 +414,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'});
@@ -379,15 +433,15 @@ sub batch_info {
             $template->param('current_matcher_description' => $matcher->description());
         }
     }
-    add_matcher_list($batch->{'matcher_id'});
+    add_matcher_list($template,$batch->{'matcher_id'});
 }
 
 sub add_matcher_list {
-    my $current_matcher_id = shift;
+    my ($template,$current_matcher_id) = @_;
     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;
             }
         }