From: djfiander Date: Sat, 14 Mar 2009 15:03:03 +0000 (+0000) Subject: Minor stylistic cleanups X-Git-Tag: sprint4-merge-nov22~10526 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7b3808351f0a2a795cd56b084304158ad6ac474f;p=working%2FEvergreen.git Minor stylistic cleanups git-svn-id: svn://svn.open-ils.org/ILS/trunk@12521 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/MFHD.pm b/Open-ILS/src/perlmods/OpenILS/Utils/MFHD.pm index 91201f2133..d992ebaf6a 100755 --- a/Open-ILS/src/perlmods/OpenILS/Utils/MFHD.pm +++ b/Open-ILS/src/perlmods/OpenILS/Utils/MFHD.pm @@ -4,13 +4,10 @@ use integer; use Carp; use Data::Dumper; -use MARC::Record; -use MFHD::Caption; -use MFHD::Holding; +use base 'MARC::Record'; -our @ISA; - -@ISA = qw(MARC::Record); +use OpenILS::Utils::MFHD::Caption; +use OpenILS::Utils::MFHD::Holding; sub new { my $proto = shift; diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Caption.pm b/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Caption.pm index 36be959ad8..0ecd9cd9d3 100755 --- a/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Caption.pm +++ b/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Caption.pm @@ -4,9 +4,8 @@ use integer; use Carp; use DateTime; -use MARC::Field; -our @ISA = qw(MARC::Field); +use base 'MARC::Field'; sub new { @@ -189,7 +188,7 @@ my $seasonpat = '(21|22|23|24)'; # Initialize $weeknopat to be '(01|02|03|...|51|52|53)' $weeknopat = '('; foreach my $weekno (1..52) { - $weeknopat .= sprintf("%02d|", $weekno); + $weeknopat .= sprintf('%02d|', $weekno); } $weeknopat .= '53)'; diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Holding.pm b/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Holding.pm index 30820e4efd..49f08c733e 100755 --- a/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Holding.pm +++ b/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Holding.pm @@ -7,9 +7,7 @@ use DateTime; use Data::Dumper; -use MARC::Field; - -our @ISA = qw(MARC::Field); +use base 'MARC::Field'; sub new { my $proto = shift; @@ -119,7 +117,7 @@ sub format_chron { sub format { my $self = shift; my $caption = $self->{_mfhdh_CAPTION}; - my $str = ""; + my $str = ''; if ($caption->enumeration_is_chronology) { # if issues are identified by chronology only, then the @@ -145,7 +143,7 @@ sub format { # a caption enclosed in parentheses is not displayed $capstr = ''; } - $str .= ($key eq 'a' ? "" : ':') . $capstr . $self->{_mfhdh_SUBFIELDS}->{$key}->{HOLDINGS}; + $str .= ($key eq 'a' ? '' : ':') . $capstr . $self->{_mfhdh_SUBFIELDS}->{$key}->{HOLDINGS}; } # Chronology