Changeset 358

Timestamp:

03/22/07 01:07:44 (20 months ago)

Author:

ogawa

Message:

Now correctly calculates 'until' dates.
And emits UNTIL dates as UTC.

Location:

cybozu2ical/trunk

Files:

• cybozu2ical (modified) (1 diff)
• lib/WWW/CybozuOffice6/Calendar.pm (modified) (1 diff)

cybozu2ical/trunk/cybozu2ical

@@ -61 +61 @@
             ( FREQ => $freq ) :
             ( FREQ => 'WEEKLY', WKST => 'SU', BYDAY => 'MO,TU,WE,TH,FR' );
-        $rrules{UNTIL} = to_icaldate($item->{until}, 1) if $item->{until};
+        $rrules{UNTIL} = to_icaldate($item->{until}) if $item->{until};
         $args{rrule} = join ';', map { $_ . '=' . $rrules{$_} } keys %rrules;
     }

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

@@ -127 +127 @@
         $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 $until = $item->{end}->clone->set(year => $1, month => $2, day => $3);
+            $until->set_time_zone('UTC');
+            $item->{until} = $until;
+        }
     }