Bug 6492 - Deleted biblios cause rebuild_zebra to fail

[koha.git] / tools / manage-marc-import.pl

diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index ccf4e79..3c43dab 100755 (executable)
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -13,9 +13,9 @@
 # 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;
@@ -27,6 +27,7 @@ use MARC::File::USMARC;
 
 # Koha modules used
 use C4::Context;
+use C4::Koha;
 use C4::Auth;
 use C4::Output;
 use C4::Biblio;
@@ -61,6 +62,16 @@ my %cookies = parse CGI::Cookie($cookie);
 my $sessionID = $cookies{'CGISESSID'}->value;
 my $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);
@@ -94,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") {
@@ -222,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;
@@ -232,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 = {
@@ -298,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