Changeset 360

Timestamp:

03/22/07 12:01:48 (20 months ago)

Author:

ogawa

Message:

Update version number. And treat more pricisely the UNTIL date.

Files:

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

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

@@ -10 +10 @@
 use Text::CSV_XS;
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 sub new {
@@ -110 +110 @@
 
 # handle recurrent events
+our %FREQUENCY = ( y => 'YEARLY', m => 'MONTHLY', w => 'WEEKLY',
+                   d => 'DAILY', n => 'WEEKDAYS' );
 sub _parse_recurrent_event {
     my $this = shift;
@@ -121 +123 @@
 
     # frequency
-    my %FREQUENCY = ( y => 'YEARLY', m => 'MONTHLY', w => 'WEEKLY',
-                      d => 'DAILY', n => 'WEEKDAYS' );
     my $freq = $fields[7];
-    if (exists $FREQUENCY{$freq}) {
+    if ($freq && exists $FREQUENCY{$freq}) {
         $item->{frequency} = $FREQUENCY{$freq};
         $item->{frequency_value} = $fields[8] || 0;
-        $item->{until} = $this->to_datetime($fields[4])
-            if $fields[4] ne '//';
+        if ($fields[4] =~ m!^(\d+)/(\d+)/(\d+)$!) {
+            my %args = (year => $1, month => $2, day => $3);
+            my $until;
+            if ($item->{is_full_day}) {
+                $until = $this->to_datetime($fields[4], ':');
+            } else {
+                $until = $item->{end}->clone->set(%args);
+                $until->set_time_zone('UTC'); # timezone must be UTC
+            }
+            $item->{until} = $until;
+        }
     }