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

diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index 7174f9a931..92cc3e59f6 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.
@@ -20,6 +20,7 @@
 #	- we delete the record having primkey=$primkey
 
 use strict;
+use warnings;
 use CGI;
 use C4::Context;
 use C4::Auth;
@@ -28,35 +29,52 @@ use C4::Output;
 sub StringSearch  {
 	my ($searchstring,$type)=@_;
 	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select host,port,db,userid,password,name,id,checked,rank,syntax,encoding from z3950servers where (name like ?) order by rank,name");
-	$sth->execute("$data[0]\%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref) {
-	    push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	$dbh->disconnect;
-	return (scalar(@results),\@results);
+    my @data = ('%');
+    my $count = 1;
+	if ( defined $searchstring ) {
+        $searchstring =~ s/\'/\\\'/g;
+        @data=split(' ',$searchstring);
+        $count=@data;
+    }
+    else {
+        $searchstring = '';
+    }
+
+    my $query    = "SELECT host,port,db,userid,password,name,id,checked,rank,syntax,encoding,timeout";
+    $query      .= " FROM z3950servers";
+    if ( $searchstring ne '' ) { $query .= " WHERE (name like ?)" }
+    $query      .= " ORDER BY rank,name";
+	my $sth=$dbh->prepare($query);
+
+    if ( $searchstring ne '' ) {
+        $sth->execute("$data[0]\%");
+    }
+    else {
+        $sth->execute;
+    }
+
+    my @results;
+    while (my $data=$sth->fetchrow_hashref) {
+        push(@results,$data);
+    }
+    $sth->finish;
+    return (scalar(@results),\@results);
 }
 
 my $input = new CGI;
 my $searchfield=$input->param('searchfield');
-my $offset=$input->param('offset');
+my $offset=$input->param('offset') || 0;
 my $script_name="/cgi-bin/koha/admin/z3950servers.pl";
 
 my $pagesize=20;
-my $op = $input->param('op');
+my $op = $input->param('op') || '';
 
 my ($template, $loggedinuser, $cookie) 
     = get_template_and_user({template_name => "admin/z3950servers.tmpl",
 				query => $input,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {parameters => 1},
+                flagsrequired => {parameters => 'parameters_remaining_permissions'},
 				debug => 1,
 				});
 
@@ -73,22 +91,15 @@ if ($op eq 'add_form') {
 	my $data;
 	if ($searchfield) {
 		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax,encoding from z3950servers where (name = ?) order by rank,name");
+		my $sth=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax,encoding,timeout from z3950servers where (name = ?) order by rank,name");
 		$sth->execute($searchfield);
 		$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 timeout encoding ) );
+    $template->param( $_ . $data->{$_} => 1)
+        for ( qw( syntax ) );
 													# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
@@ -97,33 +108,40 @@ if ($op eq 'add_form') {
 	my $dbh=C4::Context->dbh;
 	my $sth=$dbh->prepare("select * from z3950servers where name=?");
 	$sth->execute($input->param('searchfield'));
+	my $checked = $input->param('checked') ? 1 : 0;
 	if ($sth->rows) {
-		$sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,syntax=?,encoding=? where name=?");
+		$sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,syntax=?,encoding=?,timeout=? where name=?");
 		$sth->execute($input->param('host'),
 		      $input->param('port'),
 		      $input->param('db'),
 		      $input->param('userid'),
 		      $input->param('password'),
 		      $input->param('searchfield'),
-		      $input->param('checked'),
+		      $checked,
 		      $input->param('rank'),
-			 $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('syntax'),
+              $input->param('encoding'),
+              $input->param('timeout'),
 		      $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,timeout) " .
+		  "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" );
+        $sth->execute(
+            $input->param( 'host' ),
+            $input->param( 'port' ),
+            $input->param( 'db' ),
+            $input->param( 'userid' ),
+            $input->param( 'password' ),
+            $input->param( 'searchfield' ),
+            $checked,
+            $input->param( 'rank' ),
+            $input->param( 'syntax' ),
+            $input->param( 'encoding' ),
+            $input->param( 'timeout' ) );
 	}
 	$sth->finish;
 													# END $OP eq ADD_VALIDATE
@@ -133,7 +151,7 @@ if ($op eq 'add_form') {
 	$template->param(delete_confirm => 1);
 	my $dbh = C4::Context->dbh;
 
-	my $sth2=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax,encoding from z3950servers where (name = ?) order by rank,name");
+	my $sth2=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax,encoding,timeout from z3950servers where (name = ?) order by rank,name");
 	$sth2->execute($searchfield);
 	my $data=$sth2->fetchrow_hashref;
 	$sth2->finish;
@@ -146,6 +164,7 @@ if ($op eq 'add_form') {
                          checked => $data->{'checked'},
                          rank => $data->{'rank'},
                          syntax => $data->{'syntax'},
+                         timeout => $data->{'timeout'},
                          encoding => $data->{'encoding'}            );
 
 													# END $OP eq DELETE_CONFIRM
@@ -163,9 +182,8 @@ 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};
 		$urlsearchfield=~s/ /%20/g;
 		my %row	= ( name => $results->[$i]{'name'},
@@ -177,19 +195,10 @@ 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'},
+      timeout => $results->[$i]{'timeout'});
 		push @loop, \%row;
 
-                if ( $toggle eq 0 )
-                {
-                        $toggle = 1;
-                }
-                else
-                {
-                        $toggle = 0;
-                }
-
 	}
 	$template->param(loop => \@loop);
 	if ($offset>0) {