From 7f0f83a6ec38078d0b8a5b2b02e5488edd7f70a4 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Thu, 1 Oct 2009 11:27:51 +0100 Subject: [PATCH] Enable warnings in koha2marclinks.pl Fix code generating warnings with warnings enabled Signed-off-by: Galen Charlton --- admin/koha2marclinks.pl | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl index e65e1e51ab..8e0e105bfa 100755 --- a/admin/koha2marclinks.pl +++ b/admin/koha2marclinks.pl @@ -18,6 +18,7 @@ # Suite 330, Boston, MA 02111-1307 USA use strict; +use warnings; use C4::Output; use C4::Auth; use CGI; @@ -54,6 +55,7 @@ else { script_name => $script_name, else => 1 ); # we show only the TMPL_VAR names $op + $op = q{}; } my $dbh = C4::Context->dbh; @@ -61,20 +63,17 @@ my $dbh = C4::Context->dbh; ################## ADD_FORM ################################## # called by default. Used to create form to add or modify a record if ( $op eq 'add_form' ) { - my $data; - my $sth = - $dbh->prepare( + my $sth = $dbh->prepare( "select tagfield,tagsubfield,liblibrarian as lib,tab from marc_subfield_structure where kohafield=?" - ); + ); $sth->execute( $tablename . "." . $kohafield ); my ( $defaulttagfield, $defaulttagsubfield, $defaultliblibrarian ) = $sth->fetchrow; for ( my $i = 0 ; $i <= 9 ; $i++ ) { - my $sth2 = - $dbh->prepare( + my $sth2 = $dbh->prepare( "select tagfield,tagsubfield,liblibrarian as lib,tab from marc_subfield_structure where tagfield like ?" - ); + ); $sth2->execute("$i%"); my @marcarray; push @marcarray, " "; @@ -84,8 +83,8 @@ if ( $op eq 'add_form' ) { push @marcarray, "$field $tagsubfield - $liblibrarian"; } my $marclist = CGI::scrolling_list( - -name => "marc", - -values => \@marcarray, + -name => 'marc', + -values => \@marcarray, -default => "$defaulttagfield $defaulttagsubfield - $defaultliblibrarian", -size => 1, @@ -124,13 +123,12 @@ elsif ( $op eq 'add_validate' ) { else { # DEFAULT my $sth = $dbh->prepare( -"Select tagfield,tagsubfield,liblibrarian,kohafield from marc_subfield_structure" +q|select tagfield,tagsubfield,liblibrarian,kohafield from marc_subfield_structure where kohafield is not NULL and kohafield != ''| ); $sth->execute; my %fields; while ( ( my $tagfield, my $tagsubfield, my $liblibrarian, my $kohafield ) = - $sth->fetchrow ) - { + $sth->fetchrow ) { $fields{$kohafield}->{tagfield} = $tagfield; $fields{$kohafield}->{tagsubfield} = $tagsubfield; $fields{$kohafield}->{liblibrarian} = $liblibrarian; @@ -149,7 +147,7 @@ else { # DEFAULT $row_data{liblibrarian} = $fields{ $tablename . "." . $field }->{liblibrarian}; $row_data{kohafield} = $field; - $row_data{edit} = + $row_data{edit} = "$script_name?op=add_form&tablename=$tablename&kohafield=$field"; push( @loop_data, \%row_data ); } -- 2.39.5