Bugzilla – Attachment 8417 Details for
Bug 7778
Not possible to add new z39.50 servers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch #1
0001-Bug-7778-fixes-creation-of-a-new-server.patch (text/plain), 3.18 KB, created by
Adrien SAURAT
on 2012-03-21 14:34:28 UTC
(
hide
)
Description:
proposed patch #1
Filename:
MIME Type:
Creator:
Adrien SAURAT
Created:
2012-03-21 14:34:28 UTC
Size:
3.18 KB
patch
obsolete
>From 1c8c468f3175317742329eaa6f62519cca0d9e5d Mon Sep 17 00:00:00 2001 >From: Adrien Saurat <adrien.saurat@biblibre.com> >Date: Wed, 21 Mar 2012 15:29:50 +0100 >Subject: [PATCH] Bug 7778: fixes creation of a new server > >It is now possible to add a new server >The page also now complies with the bug 2505 request >(use warnings has been added, and variables declarations >corrected to prevent warnings) >--- > admin/z3950servers.pl | 39 ++++++++++++++++++++++++++++----------- > 1 files changed, 28 insertions(+), 11 deletions(-) > >diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl >index f0a4dbb..f4307e4 100755 >--- a/admin/z3950servers.pl >+++ b/admin/z3950servers.pl >@@ -20,7 +20,7 @@ > # - we delete the record having primkey=$primkey > > use strict; >-#use warnings; FIXME - Bug 2505 >+use warnings; > use CGI; > use C4::Context; > use C4::Auth; >@@ -29,16 +29,33 @@ 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 @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"; >+ $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->execute; > $sth->finish; > $dbh->disconnect; > return (scalar(@results),\@results); >@@ -46,11 +63,11 @@ sub StringSearch { > > 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", >@@ -119,7 +136,7 @@ if ($op eq 'add_form') { > $input->param( 'userid' ), > $input->param( 'password' ), > $input->param( 'searchfield' ), >- $input->param( 'checked' ), >+ $checked, > $input->param( 'rank' ), > $input->param( 'syntax' ), > $input->param( 'encoding' ) ); >@@ -162,8 +179,8 @@ if ($op eq 'add_form') { > $template->param(else => 1); > my ($count,$results)=StringSearch($searchfield,'web'); > my @loop; >+ > 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'}, >-- >1.7.4.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7778
:
8417
|
8429