From a1a8cc41f6e389553213251ad9d40e8924fb6aa6 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 17 Sep 2012 12:04:53 +0200 Subject: [PATCH] Bug 7688 follow-up: Small fixes for QA #2 - "return undef" -> "return" - ":utf8" -> ":encoding(UTF-8)" - TAB -> SPACES Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Paul Poulain Signed-off-by: Jared Camins-Esakov --- C4/Serials/Frequency.pm | 4 ++-- C4/Serials/Numberpattern.pm | 4 ++-- serials/create-numberpattern.pl | 2 +- serials/subscription-frequency.pl | 2 +- serials/subscription-numberpattern.pl | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/C4/Serials/Frequency.pm b/C4/Serials/Frequency.pm index d5c1cbd78a..51e149fcfe 100644 --- a/C4/Serials/Frequency.pm +++ b/C4/Serials/Frequency.pm @@ -129,7 +129,7 @@ sub AddSubscriptionFrequency { my $frequency = shift; unless(ref($frequency) eq 'HASH' && defined $frequency->{'description'} && $frequency->{'description'} ne '') { - return undef; + return; } my @keys; @@ -201,7 +201,7 @@ sub ModSubscriptionFrequency { || !defined $frequency->{'description'} ) ) { - return undef; + return; } my @keys; diff --git a/C4/Serials/Numberpattern.pm b/C4/Serials/Numberpattern.pm index 4e35803428..8747344552 100644 --- a/C4/Serials/Numberpattern.pm +++ b/C4/Serials/Numberpattern.pm @@ -143,7 +143,7 @@ sub AddSubscriptionNumberpattern { && defined $numberpattern->{'numberingmethod'} && $numberpattern->{'numberingmethod'} ne '' ) { - return undef; + return; } my @keys; @@ -206,7 +206,7 @@ sub ModSubscriptionNumberpattern { || !defined $numberpattern->{'numberingmethod'} ) ) { - return undef; + return; } my @keys; diff --git a/serials/create-numberpattern.pl b/serials/create-numberpattern.pl index d5e6abf6b3..8aa967e7f3 100755 --- a/serials/create-numberpattern.pl +++ b/serials/create-numberpattern.pl @@ -37,6 +37,6 @@ if($rv == 0) { ModSubscriptionNumberpattern($numberpattern); } -binmode STDOUT, ":utf8"; +binmode STDOUT, ":encoding(UTF-8)"; print $input->header(-type => 'text/plain', -charset => 'UTF-8'); print "{\"numberpatternid\":\"$numberpatternid\"}"; diff --git a/serials/subscription-frequency.pl b/serials/subscription-frequency.pl index 965b0ff412..ddfb61681c 100755 --- a/serials/subscription-frequency.pl +++ b/serials/subscription-frequency.pl @@ -14,6 +14,6 @@ if ($auth_status ne "ok") { exit 0; } my $frequencyrecord=GetSubscriptionFrequency($frqid); -binmode STDOUT, ":utf8"; +binmode STDOUT, ":encoding(UTF-8)"; print $input->header(-type => 'text/plain', -charset => 'UTF-8'); print "{".join (",",map { "\"$_\":\"".uri_escape($frequencyrecord->{$_})."\"" }sort keys %$frequencyrecord)."}"; diff --git a/serials/subscription-numberpattern.pl b/serials/subscription-numberpattern.pl index 5da614e4c1..c54f2648a3 100755 --- a/serials/subscription-numberpattern.pl +++ b/serials/subscription-numberpattern.pl @@ -10,6 +10,6 @@ my $input=new CGI; my $numpatternid=$input->param("numberpattern_id"); my $numberpatternrecord=GetSubscriptionNumberpattern($numpatternid); -binmode STDOUT, ":utf8"; +binmode STDOUT, ":encoding(UTF-8)"; print $input->header(-type => 'text/plain', -charset => 'UTF-8'); print "{",join (",",map {"\"$_\":\"".(uri_escape($numberpatternrecord->{$_}) // '')."\"" }sort keys %$numberpatternrecord),"}"; -- 2.39.5