bug Fix 3712

[koha.git] / C4 / Dates.pm

diff --git a/C4/Dates.pm b/C4/Dates.pm
index 8af350c..7563b51 100644 (file)
--- a/C4/Dates.pm
+++ b/C4/Dates.pm
@@ -63,7 +63,12 @@ our %dmy_subs = (                    # strings to eval  (after using regular expression returned
 sub regexp ($;$) {
        my $self = shift;
        my $delim = qr/:?\:|\/|-/;      # "non memory" cluster: no backreference
-       my $format = (@_) ? shift : $self->{'dateformat'};      # w/o arg. relies on dateformat being defined
+       my $format = (@_) ? _recognize_format(shift) : ($self->{'dateformat'} || _prefformat());
+
+    # Extra layer of checking $self->{'dateformat'}.
+    # Why?  Because it is assumed you might want to check regexp against an *instantiated* Dates object as a
+    # way of saying "does this string match *whatever* format that Dates object is?"
+
        ($format eq 'sql') and 
        return qr/^(\d{4})(\d{2})(\d{2})(?:\s{4}(\d{2})(\d{2})(\d{2}))?/;
        ($format eq 'iso') and 
@@ -111,43 +116,26 @@ sub _chron_to_hms {
 }
 
 sub new {
-    shift; # as clone isn't implemented, we don't carre about package name
-    my $self = bless {}, __PACKAGE__;
-    $self->init(@_)
+       my $this = shift;
+       my $class = ref($this) || $this;
+       my $self = {};
+       bless $self, $class;
+       return $self->init(@_);
 }
-
 sub init ($;$$) {
-    my ($self,$string_date,$dformat) = @_; 
-
-    my $from;
-    if ( $dformat ) { 
-        $from = 'argument';
-    } else {
-        $from    = 'system preferences';
-        $dformat = _prefformat;
-    }   
-
-    $self->{'dateformat'} = $dformat;
-    $format_map{$dformat} or croak "Invalid date format '$dformat' from $from";
-
-    $self->{'dmy_arrayref'} = $string_date
-       ? $self->dmy_map($string_date)
-       : localtime
-    ;
-
-    $debug and warn
-        q[(during init) @$self->{'dmy_arrayref'}:] 
-        , join(' ',@{$self->{'dmy_arrayref'}})
-        , "\n"
-    ;
-
-    return $self;
+       my $self = shift;
+       my $dformat;
+       $self->{'dateformat'} = $dformat = (scalar(@_) >= 2) ? $_[1] : _prefformat();
+       ($format_map{$dformat}) or croak 
+               "Invalid date format '$dformat' from " . ((scalar(@_) >= 2) ? 'argument' : 'system preferences');
+       $self->{'dmy_arrayref'} = [((@_) ? $self->dmy_map(shift) : localtime )] ;
+       $debug and warn "(during init) \@\$self->{'dmy_arrayref'}: " . join(' ',@{$self->{'dmy_arrayref'}}) . "\n";
+       return $self;
 }
-
 sub output ($;$) {
-       my $self = shift;
-       my $newformat = (@_) ? _recognize_format(shift) : _prefformat();
-       return (eval {POSIX::strftime($posix_map{$newformat}, @{$self->{'dmy_arrayref'}})} || undef);
+       my $self = shift;
+       my $newformat = (@_) ? _recognize_format(shift) : _prefformat();
+       return (eval {POSIX::strftime($posix_map{$newformat}, @{$self->{'dmy_arrayref'}})} || undef);
 }
 sub today ($;$) {              # NOTE: sets date value to today (and returns it in the requested or current format)
        my $class = shift;