[Koha-patches] [PATCH 1/2] bug 2505: enable warnings in tools/manage-marc-import.pl
Galen Charlton
gmcharlt at gmail.com
Mon Aug 10 06:18:07 CEST 2009
---
tools/manage-marc-import.pl | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index eb218d9..c9946f3 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;
@@ -37,10 +38,10 @@ 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;
@@ -74,7 +75,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);
@@ -117,7 +118,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;
@@ -135,7 +136,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;
}
@@ -322,7 +323,14 @@ 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);
+ 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'},
@@ -331,7 +339,7 @@ sub import_biblios_list {
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_citation => $match_citation,
match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
};
}
@@ -389,7 +397,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;
}
}
--
1.5.6.5
More information about the Koha-patches
mailing list