Changeset 346

Timestamp:

11/14/06 00:45:43 (2 years ago)

Author:

ogawa

Message:

Fix a bug for events without enddates.
Fix a bug for handling outranged dates.

Files:

• WWW-CybozuOffice6-Calendar/trunk/lib/WWW/CybozuOffice6/Calendar.pm (modified) (2 diffs)

WWW-CybozuOffice6-Calendar/trunk/lib/WWW/CybozuOffice6/Calendar.pm

@@ -87 +87 @@
         $is_full_day = 1;
     } elsif ($fields[6] =~ /^:$/) {     # event w/o endtime
-        $end   = $start->add(minutes => 10);
+        $end   = $start->clone->add(minutes => 10);
     }
 
@@ -137 +137 @@
     my @d = split '/', $_[0] || '';
     my @t = split ':', $_[1] || '';
-    DateTime->new(
-        year => $d[0], month => $d[1], day => $d[2],
-        hour => $t[0] || 0, minute => $t[1] || 0, second => $t[2] || 0,
+    my %args = (
+        year      => $d[0],
+        month     => $d[1],
+        day       => $d[2],
+        hour      => $t[0] || 0,
+        minute    => $t[1] || 0,
+        second    => $t[2] || 0,
         time_zone => $this->{time_zone} || 'Asia/Tokyo',
     );
+    if ($args{hour} >= 24) {
+        $args{hour}   = 23;
+        $args{minute} = 59;
+        $args{second} = 59;
+    }
+    DateTime->new(%args);
 }