[Koha-patches] [PATCH] perltidy some ugly value_builder plugins

Joe Atzberger joe.atzberger at liblime.com
Fri Mar 13 20:22:42 CET 2009


---
 cataloguing/value_builder/marc21_field_006.pl |  131 +++++++++---------
 cataloguing/value_builder/marc21_field_007.pl |   67 +++++-----
 cataloguing/value_builder/marc21_field_008.pl |  178 +++++++++++++------------
 3 files changed, 192 insertions(+), 184 deletions(-)

diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index 745f1ac..506f742 100755
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -31,15 +30,16 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ($dbh, $record, $tagslib, $i, $tabloop) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= $field_number;
-my $res="
+    my ($dbh, $record, $tagslib, $field_number, $tabloop) = @_;
+    my $function_name = $field_number;
+    my $res           = "
 <script type=\"text/javascript\">
 //<![CDATA[
 
@@ -60,66 +60,69 @@ function Clic$function_name(i) {
 </script>
 ";
 
-return ($function_name,$res);
+    return ($function_name, $res);
 }
+
 sub plugin {
-my ($input) = @_;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_field_006.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-	$result = "a|||||r|||| 00| 0 " unless $result;
-#	$result = "a     r     00  0 " unless $result;
-	my $f0 = substr($result,0,1);
-	my $f014 = substr($result,1,4);
-	my $f5 = substr($result,5,1);
-	my $f6 = substr($result,6,1);
-	my $f710 = substr($result,7,4);
-	my $f11 = substr($result,11,1);
-	my $f12 = substr($result,12,1);
-	my $f13 = substr($result,13,1);
-	my $f14 = substr($result,14,1);
-	my $f15 = substr($result,15,1);
-	my $f16 = substr($result,16,1);
-	my $f17 = substr($result,17,1);
-
-	$template->param(				index => $index,
-							f0 => $f0,
-							"f0$f0" => $f0,
-							f014 => $f014,
-							"f014$f014" => $f014,
-							f5 => $f5,
-							"f5$f5" => $f5,
-							f6 => $f6,
-							"f6$f6" => $f6,
-							f710 => $f710,
-							"f710$f710" => $f710,
-							f11 => $f11,
-                                                        "f11$f11" => $f11,
-							f12 => $f12,
-							"f12$f12" => $f12,
-							f13 => $f13,
-                                                        "f13$f13" => $f13,
-							f14 => $f14,
-                                                        "f14$f14" => $f14,
-							f15 => $f15,
-                                                        "f15$f15" => $f15,
-							f16 => $f16,
-                                                        "f16$f16" => $f16,
-							f17 => $f17,
-							"f17$f17" => $f17,
-					);
-        output_html_with_http_headers $input, $cookie, $template->output;
+    my ($input) = @_;
+    my $index   = $input->param('index');
+    my $result  = $input->param('result');
+
+    my $dbh = C4::Context->dbh;
+
+    my ($template, $loggedinuser, $cookie) = get_template_and_user(
+        {   template_name   => "cataloguing/value_builder/marc21_field_006.tmpl",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+    $result = "a|||||r|||| 00| 0 " unless $result;
+
+    #	$result = "a     r     00  0 " unless $result;
+    my $f0   = substr($result, 0,  1);
+    my $f014 = substr($result, 1,  4);
+    my $f5   = substr($result, 5,  1);
+    my $f6   = substr($result, 6,  1);
+    my $f710 = substr($result, 7,  4);
+    my $f11  = substr($result, 11, 1);
+    my $f12  = substr($result, 12, 1);
+    my $f13  = substr($result, 13, 1);
+    my $f14  = substr($result, 14, 1);
+    my $f15  = substr($result, 15, 1);
+    my $f16  = substr($result, 16, 1);
+    my $f17  = substr($result, 17, 1);
+
+    $template->param(
+        index       => $index,
+        f0          => $f0,
+        "f0$f0"     => $f0,
+        f014        => $f014,
+        "f014$f014" => $f014,
+        f5          => $f5,
+        "f5$f5"     => $f5,
+        f6          => $f6,
+        "f6$f6"     => $f6,
+        f710        => $f710,
+        "f710$f710" => $f710,
+        f11         => $f11,
+        "f11$f11"   => $f11,
+        f12         => $f12,
+        "f12$f12"   => $f12,
+        f13         => $f13,
+        "f13$f13"   => $f13,
+        f14         => $f14,
+        "f14$f14"   => $f14,
+        f15         => $f15,
+        "f15$f15"   => $f15,
+        f16         => $f16,
+        "f16$f16"   => $f16,
+        f17         => $f17,
+        "f17$f17"   => $f17,
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index 9ba0b09..c2c5770 100755
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -33,14 +32,14 @@ plugin_parameters : other parameters added when the plugin is called by the dopo
 =cut
 
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ($dbh, $record, $tagslib, $i, $tabloop) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= $field_number;
-my $res="
+    my ($dbh, $record, $tagslib, $field_number, $tabloop) = @_;
+    my $function_name = $field_number;
+    my $res           = "
 <script type=\"text/javascript\">
 //<![CDATA[
 
@@ -61,35 +60,37 @@ function Clic$function_name(i) {
 </script>
 ";
 
-return ($function_name,$res);
+    return ($function_name, $res);
 }
+
 sub plugin {
-my ($input) = @_;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_field_007.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-	$result = "ta" unless $result;
-	my $f0 = substr($result,0,1);
-	my $f1 = substr($result,1,4);
-
-	$template->param(				index => $index,
-							f0 => $f0,
-							"f0$f0" => $f0,
-							f1 => $f1,
-                                                        "f1$f1" => $f1,
-					);
-        output_html_with_http_headers $input, $cookie, $template->output;
+    my ($input) = @_;
+    my $index   = $input->param('index');
+    my $result  = $input->param('result');
+
+    my $dbh = C4::Context->dbh;
+
+    my ($template, $loggedinuser, $cookie) = get_template_and_user(
+        {   template_name   => "cataloguing/value_builder/marc21_field_007.tmpl",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+    $result = "ta" unless $result;
+    my $f0 = substr($result, 0, 1);
+    my $f1 = substr($result, 1, 4);
+
+    $template->param(
+        index   => $index,
+        f0      => $f0,
+        "f0$f0" => $f0,
+        f1      => $f1,
+        "f1$f1" => $f1,
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index 793f013..7d4d2b8 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -33,19 +32,21 @@ plugin_parameters : other parameters added when the plugin is called by the dopo
 =cut
 
 # find today's date
-my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); 
+my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime(time);
+
+$year += 1900;
+$mon  += 1;
+my $dateentered = substr($year, 2, 2) . sprintf("%0.2d", $mon) . sprintf("%0.2d", $mday);
 
-$year +=1900; $mon +=1;
-my $dateentered = substr($year,2,2).sprintf ("%0.2d", $mon).sprintf ("%0.2d",$mday);
 sub plugin_parameters {
-	my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-	return "";
+    my ($dbh, $record, $tagslib, $i, $tabloop) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-	my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-	my $function_name= $field_number;
-	my $res="
+    my ($dbh, $record, $tagslib, $field_number, $tabloop) = @_;
+    my $function_name = $field_number;
+    my $res           = "
 <script type=\"text/javascript\">
 //<![CDATA[
 
@@ -72,86 +73,89 @@ function Clic$function_name(i) {
 </script>
 ";
 
-	return ($function_name,$res);
-}
-sub plugin {
-	my ($input) = @_;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-	my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_field_008.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-#	$result = "      t        xxu           00  0 eng d" unless $result;
-	$result = "$dateentered"."t        xxu||||| |||| 00| 0 eng d" unless $result;
-	my $f1 = substr($result,0,6);
-	my $f6 = substr($result,6,1);
-	my $f710 = substr($result,7,4);
-	my $f1114 = substr($result,11,4);
-	my $f1517 = substr($result,15,3);
-	my $f1821 = substr($result,18,4);
-	my $f22 = substr($result,22,1);
-	my $f23 = substr($result,23,1);
-	my $f2427 = substr($result,24,4);
-	my $f28 = substr($result,28,1);
-	my $f29 = substr($result,29,1);
-	my $f30 = substr($result,30,1);
-	my $f31 = substr($result,31,1);
-	my $f33 = substr($result,33,1);
-	my $f34 = substr($result,34,1);
-	my $f3537 = substr($result,35,3);
-	my $f38 = substr($result,38,1);
-	my $f39 = substr($result,39,1);
-
-	# bug 2563
-	$f710  = "" if ($f710  =~ /^\s*$/);
-	$f1114 = "" if ($f1114 =~ /^\s*$/);
-
-if ((!$f1) ||($f1 =~ m/ /)){
-	$f1=$dateentered;
+    return ($function_name, $res);
 }
 
-	$template->param(				index => $index,
-							f1 => $f1,
-							f6 => $f6,
-							"f6$f6" => $f6,
-							f710 => $f710,
-							f1114 => $f1114,
-							f1517 => $f1517,
-							f1821 => $f1821,
-							f22 => $f22,
-							"f22$f22" => $f22,
-							f23 => $f23,
-                                                        "f23$f23" => $f23,
-							f2427 => $f2427,
-							"f24$f2427" => $f2427,
-							f28 => $f28,
-                                                        "f28$f28" => $f28,
-							f29 => $f29,
-                                                        "f29$f29" => $f29,
-							f30 => $f30,
-                                                        "f230$f30" => $f30,
-							f31 => $f31,
-                                                        "f31$f31" => $f31,
-							f33 => $f33,
-                                                        "f33$f33" => $f33,
-							f34 => $f34,
-                                                        "f34$f34" => $f34,
-							f3537 => $f3537,
-							f38 => $f38,
-							"f38$f38" => $f38,
-							f39 => $f39,
-							"f39$f39" => $f39,
-					);
-        output_html_with_http_headers $input, $cookie, $template->output;
+sub plugin {
+    my ($input) = @_;
+    my $index   = $input->param('index');
+    my $result  = $input->param('result');
+
+    my $dbh = C4::Context->dbh;
+
+    my ($template, $loggedinuser, $cookie) = get_template_and_user(
+        {   template_name   => "cataloguing/value_builder/marc21_field_008.tmpl",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+
+    #	$result = "      t        xxu           00  0 eng d" unless $result;
+    $result = "$dateentered" . "t        xxu||||| |||| 00| 0 eng d" unless $result;
+    my $f1    = substr($result, 0,  6);
+    my $f6    = substr($result, 6,  1);
+    my $f710  = substr($result, 7,  4);
+    my $f1114 = substr($result, 11, 4);
+    my $f1517 = substr($result, 15, 3);
+    my $f1821 = substr($result, 18, 4);
+    my $f22   = substr($result, 22, 1);
+    my $f23   = substr($result, 23, 1);
+    my $f2427 = substr($result, 24, 4);
+    my $f28   = substr($result, 28, 1);
+    my $f29   = substr($result, 29, 1);
+    my $f30   = substr($result, 30, 1);
+    my $f31   = substr($result, 31, 1);
+    my $f33   = substr($result, 33, 1);
+    my $f34   = substr($result, 34, 1);
+    my $f3537 = substr($result, 35, 3);
+    my $f38   = substr($result, 38, 1);
+    my $f39   = substr($result, 39, 1);
+
+    # bug 2563
+    $f710  = "" if ($f710  =~ /^\s*$/);
+    $f1114 = "" if ($f1114 =~ /^\s*$/);
+
+    if ((!$f1) || ($f1 =~ m/ /)) {
+        $f1 = $dateentered;
+    }
+
+    $template->param(
+        index       => $index,
+        f1          => $f1,
+        f6          => $f6,
+        "f6$f6"     => $f6,
+        f710        => $f710,
+        f1114       => $f1114,
+        f1517       => $f1517,
+        f1821       => $f1821,
+        f22         => $f22,
+        "f22$f22"   => $f22,
+        f23         => $f23,
+        "f23$f23"   => $f23,
+        f2427       => $f2427,
+        "f24$f2427" => $f2427,
+        f28         => $f28,
+        "f28$f28"   => $f28,
+        f29         => $f29,
+        "f29$f29"   => $f29,
+        f30         => $f30,
+        "f230$f30"  => $f30,
+        f31         => $f31,
+        "f31$f31"   => $f31,
+        f33         => $f33,
+        "f33$f33"   => $f33,
+        f34         => $f34,
+        "f34$f34"   => $f34,
+        f3537       => $f3537,
+        f38         => $f38,
+        "f38$f38"   => $f38,
+        f39         => $f39,
+        "f39$f39"   => $f39,
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
-- 
1.5.6.5




More information about the Koha-patches mailing list