X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fz3950servers.pl;h=be7cae5d171adc7a1c87b9a7886335856e3ae36d;hb=d4260af339b74b597e96b5223e5ee8d88de5925d;hp=7174f9a9312294c370c4d92feb84d8658dd14b1b;hpb=b5a106078808677b538291266efa791365ec0db8;p=koha.git

diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index 7174f9a931..be7cae5d17 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -5,7 +5,7 @@
 # This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
 
 # ALGO :
-# this script use an $op to know what to do.
+# this script use ano $op to know what to do.
 # if $op is empty or none of the above values,
 #	- the default screen is build (with all records, or filtered datas).
 #	- the   user can clic on add, modify or delete record.
@@ -78,17 +78,10 @@ if ($op eq 'add_form') {
 		$data=$sth->fetchrow_hashref;
 		$sth->finish;
 	}
-	
-	$template->param(host => $data->{'host'},
-			 port => $data->{'port'},
-			 db   => $data->{'db'},
-			 userid => $data->{'userid'},
-			 password => $data->{'password'},
-			 checked => $data->{'checked'},
-			 rank => $data->{'rank'},
-       syntax => $data->{'syntax'},
-       encoding => $data->{'encoding'},
-       );
+    $template->param( $_ => $data->{$_} ) 
+        for ( qw( host port db userid password checked rank ) );
+    $template->param( $_ . $data->{$_} => 1)
+        for ( qw( syntax encoding ) );
 													# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
@@ -107,23 +100,27 @@ if ($op eq 'add_form') {
 		      $input->param('searchfield'),
 		      $input->param('checked'),
 		      $input->param('rank'),
-			 $input->param('syntax'),
-          $input->param('encoding'),
+			  $input->param('syntax'),
+              $input->param('encoding'),
 		      $input->param('searchfield'),
 		      );
-	} else {
-		$sth=$dbh->prepare("insert into z3950servers (host,port,db,userid,password,name,checked,rank,syntax) values (?, ?, ?, ?, ?, ?, ?, ?,?)");
-		$sth->execute($input->param('host'),
-		      $input->param('port'),
-		      $input->param('db'),
-		      $input->param('userid'),
-		      $input->param('password'),
-		      $input->param('searchfield'),
-		      $input->param('checked'),
-		      $input->param('rank'),
-			 $input->param('syntax'),
-          $input->param('encoding'),
-		      );
+	} 
+	else {
+		$sth=$dbh->prepare(
+		  "INSERT INTO z3950servers " .
+		  "(host,port,db,userid,password,name,checked,rank,syntax,encoding) " .
+		  "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" );
+        $sth->execute(
+            $input->param( 'host' ),
+            $input->param( 'port' ),
+            $input->param( 'db' ),
+            $input->param( 'userid' ),
+            $input->param( 'password' ),
+            $input->param( 'searchfield' ),
+            $input->param( 'checked' ),
+            $input->param( 'rank' ),
+            $input->param( 'syntax' ),
+            $input->param( 'encoding' ) );
 	}
 	$sth->finish;
 													# END $OP eq ADD_VALIDATE
@@ -163,7 +160,6 @@ if ($op eq 'add_form') {
 	$template->param(else => 1);
 	my ($count,$results)=StringSearch($searchfield,'web');
 	my @loop;
-	my $toggle = 0;
 	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
 			
 		my $urlsearchfield=$results->[$i]{name};
@@ -177,19 +173,9 @@ if ($op eq 'add_form') {
 			checked => $results->[$i]{'checked'},
 			rank => $results->[$i]{'rank'},
 			syntax => $results->[$i]{'syntax'},
-      encoding => $results->[$i]{'encoding'},
-			toggle => $toggle);
+      encoding => $results->[$i]{'encoding'});
 		push @loop, \%row;
 
-                if ( $toggle eq 0 )
-                {
-                        $toggle = 1;
-                }
-                else
-                {
-                        $toggle = 0;
-                }
-
 	}
 	$template->param(loop => \@loop);
 	if ($offset>0) {