[Koha-patches] [PATCH 5/6] textual cleanup of new quick spine label code

Galen Charlton gmcharlt at gmail.com
Sun Aug 2 17:07:05 CEST 2009


* perltidy
* added license header to source files
---
 labels/spinelabel-home.pl  |   18 ++++++++++-
 labels/spinelabel-print.pl |   69 ++++++++++++++++++++++++++------------------
 2 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/labels/spinelabel-home.pl b/labels/spinelabel-home.pl
index 4d577db..bf61b9c 100755
--- a/labels/spinelabel-home.pl
+++ b/labels/spinelabel-home.pl
@@ -1,5 +1,20 @@
 #!/usr/bin/perl
 
+# 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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
 use warnings;
 use strict;
 use CGI;
@@ -11,8 +26,7 @@ use C4::Context;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "labels/spinelabel-home.tmpl",
+    {   template_name   => "labels/spinelabel-home.tmpl",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/spinelabel-print.pl b/labels/spinelabel-print.pl
index 6f4233a..1cfa103 100755
--- a/labels/spinelabel-print.pl
+++ b/labels/spinelabel-print.pl
@@ -1,5 +1,20 @@
 #!/usr/bin/perl
 
+# 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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
 use warnings;
 use strict;
 use CGI;
@@ -7,10 +22,9 @@ use C4::Auth;
 use C4::Output;
 
 my $scheme = C4::Context->preference('SpineLabelFormat');
-my $query = new CGI;
+my $query  = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "labels/spinelabel-print.tmpl",
+    {   template_name   => "labels/spinelabel-print.tmpl",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -19,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-
 my $barcode = $query->param('barcode');
 
 my $dbh = C4::Context->dbh;
@@ -31,43 +44,43 @@ my $sql = "SELECT * FROM biblio, biblioitems, items
           WHERE biblio.biblionumber = items.biblionumber 
           AND biblioitems.biblioitemnumber = items.biblioitemnumber 
           AND items.barcode = ?";
-$sth = $dbh->prepare( $sql );
-$sth->execute( $barcode );
+$sth = $dbh->prepare($sql);
+$sth->execute($barcode);
 $item = $sth->fetchrow_hashref;
 
 my $body;
 
 my $data;
-while ( my ($key, $value ) = each(%$item) ) {
-  $data->{$key} .= "<span class='field' id='$key'>";
+while ( my ( $key, $value ) = each(%$item) ) {
+    $data->{$key} .= "<span class='field' id='$key'>";
 
-  $value = '' unless defined $value;
-  my @characters = split(//, $value );
-  my $charnum = 1;
-  my $wordnum = 1;
-  my $i = 1;
-  foreach my $char ( @characters ) {
-    if ( $char ne ' ' ) {
-      $data->{$key} .= "<span class='character word$wordnum character$charnum' id='$key$i'>$char</span>";
-    } else {
-      $data->{$key} .= "<span class='space character$charnum' id='$key$i'>$char</span>";
-      $wordnum++;
-      $charnum = 1;
+    $value = '' unless defined $value;
+    my @characters = split( //, $value );
+    my $charnum    = 1;
+    my $wordnum    = 1;
+    my $i          = 1;
+    foreach my $char (@characters) {
+        if ( $char ne ' ' ) {
+            $data->{$key} .= "<span class='character word$wordnum character$charnum' id='$key$i'>$char</span>";
+        } else {
+            $data->{$key} .= "<span class='space character$charnum' id='$key$i'>$char</span>";
+            $wordnum++;
+            $charnum = 1;
+        }
+        $charnum++;
+        $i++;
     }
-    $charnum++;
-    $i++;
-  }
-  
-  $data->{$key} .= "</span>";
+
+    $data->{$key} .= "</span>";
 }
 
-while ( my ($key, $value ) = each(%$data) ) {
-  $scheme =~ s/<$key>/$value/g;
+while ( my ( $key, $value ) = each(%$data) ) {
+    $scheme =~ s/<$key>/$value/g;
 }
 
 $body = $scheme;
 
 $template->param( autoprint => C4::Context->preference("SpineLabelAutoPrint") );
-$template->param( content => $body );
+$template->param( content   => $body );
 
 output_html_with_http_headers $query, $cookie, $template->output;
-- 
1.5.6.5




More information about the Koha-patches mailing list