X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fz3950servers.pl;h=d1fe85b2f0d9ed7c9ce19b890159dd450175672f;hb=edf99afa63e2c57fcda3f39ef36a651ac109d643;hp=3bc0ef29de70c20cc27f01b10cfbb4e7fabfae8b;hpb=9ec7ac5b8e036ad824636df5acd4e1ec2ebb45c8;p=koha.git

diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index 3bc0ef29de..d1fe85b2f0 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -1,214 +1,119 @@
 #!/usr/bin/perl
 
-#script to administer the branches table
-#written 20/02/2002 by paul.poulain@free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# 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.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-use strict;
-use warnings;
-use CGI;
+# Copyright 2002 paul.poulain@free.fr
+# Copyright 2014 Rijksmuseum
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+
+# This script is used to maintain the Z3950 servers table.
+# Parameter $op is operation: list, new, edit, add_validated, delete_confirmed.
+# add_validated saves a validated record and goes to list view.
+# delete_confirmed deletes a record and goes to list view.
+
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Auth;
 use C4::Output;
+use Koha::Database;
 
-sub StringSearch  {
-	my ($searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-    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);
+# Initialize CGI, template, database
 
-    if ( $searchstring ne '' ) {
-        $sth->execute("$data[0]\%");
+my $input = new CGI;
+my $op = $input->param('op') || 'list';
+my $id = $input->param('id') || 0;
+my $type = $input->param('type') || '';
+my $searchfield = '';
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user( {
+    template_name => "admin/z3950servers.tt",
+    query => $input,
+    type => "intranet",
+    authnotrequired => 0,
+    flagsrequired => {parameters => 'parameters_remaining_permissions'},
+    debug => 1,
+});
+my $script_name = "/cgi-bin/koha/admin/z3950servers.pl";
+$template->param( script_name => $script_name );
+
+my $schema = Koha::Database->new()->schema();
+
+# Main code
+# First process a confirmed delete, or save a validated record
+
+if( $op eq 'delete_confirmed' && $id ) {
+    my $server = $schema->resultset('Z3950server')->find($id);
+    if ( $server ) {
+        $server->delete;
+        $template->param( msg_deleted => 1, msg_add => $server->servername );
+    } else {
+        $template->param( msg_notfound => 1, msg_add => $id );
     }
-    else {
-        $sth->execute;
+    $id = 0;
+} elsif ( $op eq 'add_validated' ) {
+    my @fields=qw/host port db userid password rank syntax encoding timeout
+        recordtype checked servername servertype sru_options sru_fields
+        add_xslt/;
+    my $formdata = _form_data_hashref( $input, \@fields );
+    if( $id ) {
+        my $server = $schema->resultset('Z3950server')->find($id);
+        if ( $server ) {
+            $server->update( $formdata );
+            $template->param( msg_updated => 1, msg_add => $formdata->{servername} );
+        } else {
+            $template->param( msg_notfound => 1, msg_add => $id );
+        }
+        $id = 0;
+    } else {
+        $schema->resultset('Z3950server')->create( $formdata );
+        $template->param( msg_added => 1, msg_add => $formdata->{servername} );
     }
-
-	my @results;
-	while (my $data=$sth->fetchrow_hashref) {
-	    push(@results,$data);
-	}
-	$sth->finish;
-	$dbh->disconnect;
-	return (scalar(@results),\@results);
+} else {
+    #use searchfield only in remaining operations
+    $searchfield = $input->param('searchfield') || '';
 }
 
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-my $offset=$input->param('offset') || 0;
-my $script_name="/cgi-bin/koha/admin/z3950servers.pl";
-
-my $pagesize=20;
-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},
-				debug => 1,
-				});
-
-
-$template->param(script_name => $script_name,
-                 searchfield => $searchfield);
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	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,timeout from z3950servers where (name = ?) order by rank,name");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-    $template->param( $_ => $data->{$_} ) 
-        for ( qw( host port db userid password checked rank timeout ) );
-    $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
-} elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	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=?,timeout=? where name=?");
-		$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'),
-		      $input->param('searchfield'),
-		      );
-	} 
-	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
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$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,timeout from z3950servers where (name = ?) order by rank,name");
-	$sth2->execute($searchfield);
-	my $data=$sth2->fetchrow_hashref;
-	$sth2->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'},
-                         timeout => $data->{'timeout'},
-                         encoding => $data->{'encoding'}            );
+# Now list multiple records, or edit one record
+
+my $data = [];
+if ( $op eq 'add' || $op eq 'edit' ) {
+    $data = ServerSearch( $schema, $id, $searchfield ) if $searchfield || $id;
+    delete $data->[0]->{id} if @$data && $op eq 'add'; #cloning record
+    $template->param( add_form => 1, server => @$data? $data->[0]: undef,
+        op => $op, type => $op eq 'add'? lc $type: '' );
+} else {
+    $data = ServerSearch( $schema, $id, $searchfield );
+    $template->param( loop => \@$data, searchfield => $searchfield, id => $id,
+        op => 'list' );
+}
+output_html_with_http_headers $input, $cookie, $template->output;
 
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $dbh=C4::Context->dbh;
-	my $sth=$dbh->prepare("delete from z3950servers where name=?");
-	$sth->execute($searchfield);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	$template->param(else => 1);
-	my ($count,$results)=StringSearch($searchfield,'web');
-	my @loop;
+# End of main code
 
-	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'},
-			host => $results->[$i]{'host'},
-			port => $results->[$i]{'port'},
-			db => $results->[$i]{'db'},
-			userid =>$results->[$i]{'userid'},
-			password => ($results->[$i]{'password'}) ? ('#######') : ('&nbsp;'),
-			checked => $results->[$i]{'checked'},
-			rank => $results->[$i]{'rank'},
-			syntax => $results->[$i]{'syntax'},
-			encoding => $results->[$i]{'encoding'},
-      timeout => $results->[$i]{'timeout'});
-		push @loop, \%row;
+sub ServerSearch  { #find server(s) by id or name
+    my ( $schema, $id, $searchstring )= @_;
+    my $rs = $schema->resultset('Z3950server')->search(
+        $id ? { id => $id }: { servername => { like => $searchstring.'%' } },
+        { result_class => 'DBIx::Class::ResultClass::HashRefInflator' }
+    );
+    return [ $rs->all ];
+}
 
-	}
-	$template->param(loop => \@loop);
-	if ($offset>0) {
-		$template->param(offsetgtzero => 1,
-				prevpage => $offset-$pagesize);
-	}
-	if ($offset+$pagesize<$count) {
-		$template->param(ltcount => 1,
-				 nextpage => $offset+$pagesize);
-	}
-} #---- END $OP eq DEFAULT
-output_html_with_http_headers $input, $cookie, $template->output;
+sub _form_data_hashref {
+    my ( $input, $fieldref ) = @_;
+    return { map { ( $_ => scalar $input->param($_)//'' ) } @$fieldref };
+}