Attachment 6677 Details for Bug 6679 – [3.6.x] Bug 6679 : cataloguing/ now passing critic tests

[patch] [3.6.x] Bug 6679 : cataloguing/ now passing critic tests

Bug-6679--cataloguing-now-passing-critic-tests.patch (text/plain), 3.76 KB, created by Chris Cormack on 2011-12-08 19:26:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2011-12-08 19:26:46 UTC

Size: 3.76 KB

patch

obsolete

>From f118d89ac5d55b633c6c9bd8a62c4e1281978d1e Mon Sep 17 00:00:00 2001
>From: Chris Cormack <chrisc@catalyst.net.nz>
>Date: Mon, 31 Oct 2011 21:16:29 +1300
>Subject: [PATCH] Bug 6679 : cataloguing/ now passing critic tests
>
>Declare variables outside of conditionals
>Don't use prototypes http://www.modernperlbooks.com/mt/2009/08/the-problem-with-prototypes.html
>Use ":encoding(UTF-8)" to get strict validation.
>---
> cataloguing/addbiblio.pl |    8 ++++----
> cataloguing/additem.pl   |    3 ++-
> cataloguing/merge.pl     |    2 +-
> cataloguing/ysearch.pl   |    2 +-
> t/00-testcritic.t        |    2 +-
> 5 files changed, 9 insertions(+), 8 deletions(-)
>
>diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
>index 1a82989..71d43d7 100755
>--- a/cataloguing/addbiblio.pl
>+++ b/cataloguing/addbiblio.pl
>@@ -159,7 +159,7 @@ sub MARCfindbreeding {
> 
> =cut
> 
>-sub build_authorized_values_list ($$$$$$$) {
>+sub build_authorized_values_list {
>     my ( $tag, $subfield, $value, $dbh, $authorised_values_sth,$index_tag,$index_subfield ) = @_;
> 
>     my @authorised_values;
>@@ -252,7 +252,7 @@ sub build_authorized_values_list ($$$$$$$) {
> 
> =cut
> 
>-sub CreateKey(){
>+sub CreateKey {
>     return int(rand(1000000));
> }
> 
>@@ -263,7 +263,7 @@ sub CreateKey(){
> 
> =cut
> 
>-sub GetMandatoryFieldZ3950($){
>+sub GetMandatoryFieldZ3950 {
>     my $frameworkcode = shift;
>     my @isbn   = GetMarcFromKohaField('biblioitems.isbn',$frameworkcode);
>     my @title  = GetMarcFromKohaField('biblio.title',$frameworkcode);
>@@ -536,7 +536,7 @@ sub format_indicator {
>     return $ind_value;
> }
> 
>-sub build_tabs ($$$$$) {
>+sub build_tabs {
>     my ( $template, $record, $dbh, $encoding,$input ) = @_;
> 
>     # fill arrays
>diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
>index 4442ed3..d8bc877 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -381,7 +381,8 @@ if ($op eq "additem") {
>         my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode);
> 
> 	# If there is a barcode and we can't find him new values, we can't add multiple copies
>-        my $testbarcode = $barcodeobj->next_value($oldbarcode) if $barcodeobj;
>+	my $testbarcode;
>+        $testbarcode = $barcodeobj->next_value($oldbarcode) if $barcodeobj;
> 	if ($oldbarcode && !$testbarcode) {
> 
> 	    push @errors, "no_next_barcode";
>diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl
>index e3ee725..0b881f1 100755
>--- a/cataloguing/merge.pl
>+++ b/cataloguing/merge.pl
>@@ -250,7 +250,7 @@ Create a random value to set it into the input name
> 
> =cut
> 
>-sub createKey(){
>+sub createKey {
>     return int(rand(1000000));
> }
> 
>diff --git a/cataloguing/ysearch.pl b/cataloguing/ysearch.pl
>index 5cd0205..a697ddb 100755
>--- a/cataloguing/ysearch.pl
>+++ b/cataloguing/ysearch.pl
>@@ -39,7 +39,7 @@ my $field = $input->param('field');
> # Prevent from disclosing data
> die() unless ($table eq "biblioitems"); 
> 
>-binmode STDOUT, ":utf8";
>+binmode STDOUT, ":encoding(UTF-8)";
> print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
> 
> my ( $auth_status, $sessionID ) = check_cookie_auth( $input->cookie('CGISESSID'), { cataloguing => '*' } );
>diff --git a/t/00-testcritic.t b/t/00-testcritic.t
>index c97828b..aad6471 100755
>--- a/t/00-testcritic.t
>+++ b/t/00-testcritic.t
>@@ -16,7 +16,7 @@ my @all_koha_dirs = qw( acqui admin authorities basket C4 catalogue cataloguing
> labels members misc offline_circ opac patroncards reports reserve reviews rotating_collections
> serials sms suggestion t tags test tools virtualshelves);
> 
>-my @dirs = qw( acqui admin authorities basket catalogue circ debian errors offline_circ reserve 
>+my @dirs = qw( acqui admin authorities basket catalogue cataloguing circ debian errors offline_circ reserve 
>     reviews rotating_collections serials sms virtualshelves );
> 
> if ( not $ENV{TEST_QA} ) {
>-- 
>1.7.5.4

Actions: View | Diff | Splinter Review

Attachments on bug 6679: 4883 | 4884 | 4885 | 4886 | 4887 | 4888 | 5445 | 5446 | 5483 | 5487 | 6121 | 6122 | 6123 | 6139 | 6140 | 6141 | 6142 | 6143 | 6144 | 6270 | 6271 | 6663 | 6670 | 6675 | 6676 | 6677 | 6678 | 8542 | 8897 | 8898 | 8899 | 8950 | 8951 | 9746 | 9747 | 9748 | 9749 | 9750 | 10050 | 10051 | 10052 | 10053 | 10054 | 10075 | 10076 | 10077 | 10078 | 10079 | 10484 | 10485 | 10486 | 10487 | 10488 | 10489 | 10491 | 10492 | 10493 | 10494 | 10495 | 10496 | 10497 | 10499 | 10500 | 10501 | 10502 | 10503 | 10504 | 10505 | 10506 | 10507 | 10508 | 10509 | 10510 | 10512 | 10513 | 10514 | 10515 | 10517 | 10521 | 10522 | 10523 | 10524 | 10525 | 10526 | 10527 | 10935 | 10936 | 10938 | 10940 | 10944 | 10945 | 10946 | 10947 | 10948 | 10949 | 10950 | 10952 | 10953 | 10955 | 10957 | 10958 | 10959 | 10960 | 10961 | 10962 | 10963 | 10964 | 10965 | 10966 | 10967 | 10972 | 10976 | 10979 | 10980 | 10981 | 12224 | 12363 | 12490 | 12491 | 12492 | 34191 | 34192 | 34193 | 34194 | 34195 | 34196 | 34197 | 39100 | 39101 | 39102 | 39392 | 39393 | 39394 | 39395 | 39396 | 39397 | 39398 | 42770 | 47086 | 47087 | 47088 | 47089 | 47090 | 47178 | 47179 | 47180 | 47181 | 47205 | 47206 | 47207 | 47208