Changeset 24489 for lang/perl/DateTime-Lite

Timestamp:

11/20/08 19:00:14 (5 years ago)

Author:

daisuke

Message:

bad default, other timezone fixes

Location:

lang/perl/DateTime-Lite/trunk/lib/DateTime/Lite

Files:

• TimeZone.pm (modified) (9 diffs)
• TimeZone/OffsetOnly.pm (modified) (1 diff)

lang/perl/DateTime-Lite/trunk/lib/DateTime/Lite/TimeZone.pm

@@ -29 +29 @@
 
     my $name = $p{name};
-    if ( exists $DateTime::TimeZone::Catalog::LINKS{ $name } ) {
-        $name = $DateTime::TimeZone::Catalog::LINKS{ $name };
-    } elsif ( exists $DateTime::TimeZone::Catalog::LINKS{ uc $name } ) {
-        $name = $DateTime::TimeZone::Catalog::LINKS{ uc $name };
-    }
-
-    unless ( $name =~ m,/, || $SpecialName{ $name }
-           )
-    {
-        if ( $name eq 'floating' ) {
-            return DateTime::Lite::TimeZone::Floating->new;
+    my $conf;
+    if (defined $name) {
+        if ( exists $DateTime::Lite::TimeZone::Catalog::LINKS{ $name } ) {
+            $name = $DateTime::Lite::TimeZone::Catalog::LINKS{ $name };
+        } elsif ( exists $DateTime::Lite::TimeZone::Catalog::LINKS{ uc $name } ) {
+            $name = $DateTime::Lite::TimeZone::Catalog::LINKS{ uc $name };
         }
 
-        if ( $name eq 'local' ) {
-            return DateTime::Lite::TimeZone::Local->TimeZone();
+        unless ( $name =~ m,/, || $SpecialName{ $name }) {
+            if ( $name eq 'floating' ) {
+                return DateTime::Lite::TimeZone::Floating->new;
+            }
+            if ( $name eq 'local' ) {
+                return DateTime::Lite::TimeZone::Local->TimeZone();
+            }
+    
+            if ( $name eq 'UTC' || $name eq 'Z' ) {
+                return DateTime::Lite::TimeZone::UTC->new;
+            }
+
+            return DateTime::Lite::TimeZone::OffsetOnly->new( offset => $name );
         }
-
-        if ( $name eq 'UTC' || $name eq 'Z' ) {
-            return DateTime::Lite::TimeZone::UTC->new;
-        }
-
-        return DateTime::Lite::TimeZone::OffsetOnly->new( offset => $name );
-    }
-
-    my $conf = _load_time_zone($name);
+        $conf = _load_time_zone($name);
+    }
+
     if (! $conf) {
-        Carp::croak( "The timezone '$p{name}' could not be loaded, or is an invalid name.\n" );
+        Carp::croak( "The timezone '" . ($p{name} || 'undef') . "' could not be loaded, or is an invalid name.\n" );
     }
 
@@ -65 +65 @@
             ? $zone->olson_version()
             : 'unknown';
-        my $catalog_version = DateTime::TimeZone::Catalog->OlsonVersion();
+        my $catalog_version = DateTime::Lite::TimeZone::Catalog->OlsonVersion();
 
         if ( $object_version ne $catalog_version )
@@ -360 +360 @@
     {
         local $@;
-        $tz = eval { $_[0]->new( name => $_[1] ) };
+        $tz = eval { $_[0]->load( name => $_[1] ) };
     }
 
@@ -470 +470 @@
 sub all_names
 {
-    return wantarray ? @DateTime::TimeZone::Catalog::ALL : [@DateTime::TimeZone::Catalog::ALL];
+    return wantarray ? @DateTime::Lite::TimeZone::Catalog::ALL : [@DateTime::Lite::TimeZone::Catalog::ALL];
 }
 
@@ -476 +476 @@
 {
     return wantarray
-        ? @DateTime::TimeZone::Catalog::CATEGORY_NAMES
-        : [@DateTime::TimeZone::Catalog::CATEGORY_NAMES];
+        ? @DateTime::Lite::TimeZone::Catalog::CATEGORY_NAMES
+        : [@DateTime::Lite::TimeZone::Catalog::CATEGORY_NAMES];
 }
 
@@ -483 +483 @@
 {
     return
-        wantarray ? %DateTime::TimeZone::Catalog::LINKS : {%DateTime::TimeZone::Catalog::LINKS};
+        wantarray ? %DateTime::Lite::TimeZone::Catalog::LINKS : {%DateTime::Lite::TimeZone::Catalog::LINKS};
 }
 
@@ -489 +489 @@
 {
     shift if $_[0]->isa('DateTime::Lite::TimeZone');
-    return unless exists $DateTime::TimeZone::Catalog::CATEGORIES{ $_[0] };
+    return unless exists $DateTime::Lite::TimeZone::Catalog::CATEGORIES{ $_[0] };
 
     return
         wantarray
-        ? @{ $DateTime::TimeZone::Catalog::CATEGORIES{ $_[0] } }
-        : [ $DateTime::TimeZone::Catalog::CATEGORIES{ $_[0] } ];
+        ? @{ $DateTime::Lite::TimeZone::Catalog::CATEGORIES{ $_[0] } }
+        : [ $DateTime::Lite::TimeZone::Catalog::CATEGORIES{ $_[0] } ];
 }
 
@@ -500 +500 @@
 {
     wantarray
-        ? ( sort keys %DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY )
-        : [ sort keys %DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY ];
+        ? ( sort keys %DateTime::Lite::TimeZone::Catalog::ZONES_BY_COUNTRY )
+        : [ sort keys %DateTime::Lite::TimeZone::Catalog::ZONES_BY_COUNTRY ];
 }
 
@@ -508 +508 @@
     shift if $_[0]->isa('DateTime::Lite::TimeZone');
 
-    return unless exists $DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] };
+    return unless exists $DateTime::Lite::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] };
 
     return
         wantarray
-        ? @{ $DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] } }
-        : $DateTime::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] };
+        ? @{ $DateTime::Lite::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] } }
+        : $DateTime::Lite::TimeZone::Catalog::ZONES_BY_COUNTRY{ lc $_[0] };
 }
 

lang/perl/DateTime-Lite/trunk/lib/DateTime/Lite/TimeZone/OffsetOnly.pm

@@ -16 +16 @@
 
     my $offset =
-        DateTime::Lite::TimeZone::offset_as_seconds( $p{offset} ) || 0;
+        DateTime::Lite::TimeZone::offset_as_seconds( $p{offset} );
 
     die "Invalid offset: $p{offset}\n" unless defined $offset;