Bugzilla – Attachment 694 Details for
Bug 2505
Omnibus: Enable Perl warnings in all modules and scripts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for admin/admin-home.pl and admin/roadtype.pl
0012-Bug-2505-Enabled-warnings-in-admin-home.pl-and-road.patch (text/plain), 2.56 KB, created by
Chris Cormack
on 2009-09-01 23:13:00 UTC
(
hide
)
Description:
Patch for admin/admin-home.pl and admin/roadtype.pl
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2009-09-01 23:13:00 UTC
Size:
2.56 KB
patch
obsolete
>From a5407f2340dfe39403edf06136f9137d0d5ab391 Mon Sep 17 00:00:00 2001 >From: Garry Collum <gcollum@gmail.com> >Date: Tue, 1 Sep 2009 18:59:58 -0400 >Subject: [PATCH] Bug 2505: Enabled warnings in admin-home.pl and roadtype.pl. >Content-Type: text/plain; charset="utf-8" > >Fixed warnings generated by roadtype.pl and tightened up the code (referred to cities.pl). > >No warnings were generated by admin-home.pl >--- > admin/admin-home.pl | 2 ++ > admin/roadtype.pl | 30 +++++++----------------------- > 2 files changed, 9 insertions(+), 23 deletions(-) > >diff --git a/admin/admin-home.pl b/admin/admin-home.pl >index 5a6b8fc..ad7a897 100755 >--- a/admin/admin-home.pl >+++ b/admin/admin-home.pl >@@ -16,6 +16,8 @@ > # Suite 330, Boston, MA 02111-1307 USA > > use strict; >+use warnings; >+ > use CGI; > use C4::Auth; > use C4::Output; >diff --git a/admin/roadtype.pl b/admin/roadtype.pl >index afd3636..dd3bbe0 100755 >--- a/admin/roadtype.pl >+++ b/admin/roadtype.pl >@@ -18,6 +18,8 @@ > # Suite 330, Boston, MA 02111-1307 USA > > use strict; >+use warnings; >+ > use CGI; > use C4::Context; > use C4::Output; >@@ -25,27 +27,16 @@ use C4::Auth; > > > 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 * from roadtype where (road_type like ?)"); >- $sth->execute("$data[0]%"); >- my @results; >- while (my $data=$sth->fetchrow_hashref){ >- push(@results,$data); >- } >- # $sth->execute; >- $sth->finish; >- return (scalar(@results),\@results); >+ my $sth = C4::Context->dbh->prepare("Select * from roadtype where (road_type like ?) ORDER BY road_type"); >+ $sth->execute((shift || '') . '%'); >+ return $sth->fetchall_arrayref({}); > } > > my $input = new CGI; > my $searchfield=$input->param('road_type'); > my $script_name="/cgi-bin/koha/admin/roadtype.pl"; > my $roadtypeid=$input->param('roadtypeid'); >-my $op = $input->param('op'); >+my $op = $input->param('op') || ''; > > my ($template, $loggedinuser, $cookie) > = get_template_and_user({template_name => "admin/roadtype.tmpl", >@@ -139,14 +130,7 @@ if ($op eq 'add_form') { > # END $OP eq DELETE_CONFIRMED > } else { # DEFAULT > $template->param(else => 1); >- my @loop; >- my ($count,$results)=StringSearch($searchfield,'web'); >- for (my $i=0; $i < $count; $i++){ >- my %row = (roadtypeid => $results->[$i]{'roadtypeid'}, >- road_type => $results->[$i]{'road_type'}); >- push @loop, \%row; >- } >- $template->param(loop => \@loop); >+ $template->param(loop => StringSearch($searchfield)); > > > } #---- END $OP eq DEFAULT >-- >1.5.6.5 >
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 2505
:
686
|
687
|
688
|
689
|
690
|
691
|
692
|
693
|
694
|
695
|
696
|
697
|
698
|
699
|
700
|
701
|
702
|
703
|
704
|
705
|
706
|
707
|
708
|
709
|
2223
|
3884
|
4574
|
8209
|
8317
|
8322
|
8373
|
9034
|
9035
|
9036
|
34442