From b8340153c4098aba6c85479f5d9f267b1e7af070 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Sun, 4 May 2014 21:06:50 +0000 Subject: [PATCH] Bug 7180: (follow-up) fix warnings This patch fixes some warnings (not introduced by the main patches) regarding fetching the number of bibs in a batch and fetching the list of batches. Signed-off-by: Galen Charlton --- acqui/addorderiso2709.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 10d654934d..2999206ba8 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -327,11 +327,11 @@ sub import_batches_list { foreach my $batch (@$batches) { if ( $batch->{'import_status'} =~ /^staged$|^reverted$/ ) { # check if there is at least 1 line still staged - my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, undef, $batch->{import_status}); + my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, undef, $batch->{import_status}, { order_by_direction => 'ASC' }); if (scalar @$stagedList) { push @list, { import_batch_id => $batch->{'import_batch_id'}, - num_biblios => $batch->{'num_biblios'}, + num_biblios => $batch->{'num_records'}, num_items => $batch->{'num_items'}, staged_date => $batch->{'upload_timestamp'}, import_status => $batch->{'import_status'}, @@ -401,7 +401,7 @@ sub import_biblios_list { push @list, \%cellrecord; } - my $num_biblios = $batch->{'num_biblios'}; + my $num_biblios = $batch->{'num_records'}; my $overlay_action = GetImportBatchOverlayAction($import_batch_id); my $nomatch_action = GetImportBatchNoMatchAction($import_batch_id); my $item_action = GetImportBatchItemAction($import_batch_id); @@ -425,9 +425,9 @@ sub batch_info { comments => $batch->{'comments'}, import_status => $batch->{'import_status'}, upload_timestamp => $batch->{'upload_timestamp'}, - num_biblios => $batch->{'num_biblios'}, - num_items => $batch->{'num_biblios'}); - if ($batch->{'num_biblios'} > 0) { + num_biblios => $batch->{'num_records'}, + num_items => $batch->{'num_items'}); + if ($batch->{'num_records'} > 0) { if ($batch->{'import_status'} eq 'staged' or $batch->{'import_status'} eq 'reverted') { $template->param(can_commit => 1); } -- 2.39.5