Printers code paring, related to bug 2045. This does not resolve the bug,

but it converts the template to using loop_context_var, and removes unused
variables from the script.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/admin/printers.pl b/admin/printers.pl
index 273c1ee..ce6f925 100755 (executable)
--- a/admin/printers.pl
+++ b/admin/printers.pl
@@ -52,24 +52,14 @@ sub StringSearch  {
                WHERE (printername like ?) order by printername
        ");
        $sth->execute("$data[0]%");
-       my @results;
-       my $cnt=0;
-       while (my $data=$sth->fetchrow_hashref){
-               push(@results,$data);
-               $cnt ++;
-       }
-       #  $sth->execute;
-       $sth->finish;
-       return ($cnt,\@results);
+       my $data=$sth->fetchall_arrayref({});
+       return (scalar(@$data),$data);
 }
 
 my $input = new CGI;
 my $searchfield=$input->param('searchfield');
-my $pkfield="";
-my $reqsel="";
-my $reqdel="";
 #my $branchcode=$input->param('branchcode');
-my $offset=$input->param('offset');
+my $offset=$input->param('offset') || 0;
 my $script_name="/cgi-bin/koha/admin/printers.pl";
 
 my $pagesize=20;
@@ -85,12 +75,12 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
                       debug => 1,
 });
 
-
 $template->param(searchfield => $searchfield,
                 script_name => $script_name);
 
 #start the page and read in includes
 
+my $dbh = C4::Context->dbh;
 ################## ADD_FORM ##################################
 # called by default. Used to create form to add or  modify a record
 if ($op eq 'add_form') {
@@ -98,11 +88,9 @@ if ($op eq 'add_form') {
        #---- 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 printername,printqueue,printtype from printers where printername=?");
                $sth->execute($searchfield);
                $data=$sth->fetchrow_hashref;
-               $sth->finish;
        }
 
        $template->param(printqueue => $data->{'printqueue'},
@@ -112,55 +100,37 @@ if ($op eq 'add_form') {
 # 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;
        if ($input->param('add')){
                my $sth=$dbh->prepare("INSERT INTO printers (printername,printqueue,printtype) VALUES (?,?,?)");
                $sth->execute($input->param('printername'),$input->param('printqueue'),$input->param('printtype'));
-               $sth->finish;
-       }
-       else {
+       } else {
                my $sth=$dbh->prepare("UPDATE printers SET printqueue=?,printtype=? WHERE printername=?");
                $sth->execute($input->param('printqueue'),$input->param('printtype'),$input->param('printername'));
-               $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 $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?");
        $sth->execute($searchfield);
        my $data=$sth->fetchrow_hashref;
-       $sth->finish;
        $template->param(printqueue => $data->{'printqueue'},
                         printtype  => $data->{'printtype'});
-       
                                                                                                        # 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 printers where printername=?");
        $sth->execute($searchfield);
-       $sth->finish;
                                                                                                        # END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
+################## DEFAULT ###########################################
 } else { # DEFAULT
        $template->param(else => 1);
        my ($count,$results)=StringSearch($searchfield,'web');
-       my $toggle="white";
-       my @loop;
-       for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-               my %row = ( printername => $results->[$i]{'printername'},
-                           printqueue  => $results->[$i]{'printqueue'},
-                           printtype   => $results->[$i]{'printtype'},
-                           toggle      => $toggle);
-               push @loop, \%row;
-               $toggle = ($toggle eq 'white') ? '#ffffcc' : 'white';
-       }
+       my $max = ($offset+$pagesize < $count) ? $offset+$pagesize : $count;
+       my @loop = (@$results)[$offset..$max];
        
        $template->param(loop => \@loop);
        
@@ -168,7 +138,6 @@ if ($op eq 'add_form') {
                $template->param(offsetgtzero => 1,
                                 prevpage => $offset-$pagesize);
        }
-       print "&nbsp;" x 6;
        if ($offset+$pagesize<$count) {
                $template->param(ltcount => 1,
                                 nextpage => $offset+$pagesize);

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
index b88fc99..8386018 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
@@ -80,10 +80,7 @@
        <div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
-        
 
-
-        
 <!-- TMPL_IF NAME="searchfield" -->
                <h1>Modify printer</h1>
        <!-- TMPL_ELSE -->
@@ -100,19 +97,14 @@
 <ol>   <!-- TMPL_IF NAME="searchfield" -->
                <li>
                        <span class="label">Printer Name: </span>
-                       
                                <input type="hidden" name="printername" id="" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-                       
                </li>
        <!-- TMPL_ELSE -->
                <li>
                        <label for="printername">Printer Name: </label>
-                       
                                <input type="text" name="printername" id="printername" size="50" maxlength="50" />
-                       
                </li>
        <!-- /TMPL_IF -->
-
                <li>
                        <label for="printqueue">Queue: </label>
                        <input type="text" name="printqueue" id="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->" /> 
@@ -173,12 +165,9 @@
        //<![CDATA[
        // prepare DOM for YUI Toolbar
         $(document).ready(function() {
-           yuiToolbar();
-        });
-       // YUI Toolbar Functions
-       function yuiToolbar() {
            new YAHOO.widget.Button("newprinter");
-       }       //]]>
+        });
+       //]]>
        </script>
        <ul class="toolbar">
        <li><a id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form">New Printer</a></li>
@@ -197,7 +186,7 @@
                        <th>&nbsp;</th>
                </tr>
                <!-- TMPL_LOOP NAME="loop" -->
-               <tr>
+               <tr<!-- TMPL_UNLESS NAME="__odd__" --> class="highlight"<!-- /TMPL_UNLESS -->>
                        <td><!-- TMPL_VAR NAME="printername" --></td>
                        <td><!-- TMPL_VAR NAME="printqueue" --></td>
                        <td><!-- TMPL_VAR NAME="printtype" --></td>
@@ -215,7 +204,6 @@
        <!-- /TMPL_iF -->
 <!-- /TMPL_IF -->
 
-
 </div>
 </div>
 <div class="yui-b">