Changeset 520

Timestamp:

09/05/08 00:09:03 (4 months ago)

Author:

ogawa

Message:

Correctly handles full-day events for Cybozu Office 7.
Update version number.

Location:

cybozu2ical/trunk

Files:

• cybozu2ical (modified) (3 diffs)
• lib/WWW/CybozuOffice6/Calendar.pm (modified) (1 diff)
• lib/WWW/CybozuOffice6/Calendar/Event.pm (modified) (2 diffs)

cybozu2ical/trunk/cybozu2ical

@@ -18 +18 @@
 use Getopt::Long;
 
-our $VERSION = '0.31';
+our $VERSION = '0.32';
 
 ###
@@ -140 +140 @@
         dtstamp     => to_icaldate( $item->modified ),
     );
-
-    $args{comment} = decode_utf8( $item->comment )
-      if $opt{debug} && $item->comment;
 
     if ( $item->is_full_day ) {
@@ -196 +193 @@
       if $opt{url};
 
+    $args{comment} = decode_utf8( $item->comment )
+      if $opt{debug} && $item->comment;
+
     $vevent->add_properties(%args);
     $vcalendar->add_entry($vevent);

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

@@ -12 +12 @@
 use WWW::CybozuOffice6::Calendar::RecurrentEvent;
 
-our $VERSION = '0.31';
+our $VERSION = '0.32';
 
 sub new {

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

@@ -34 +34 @@
     # (set_time == empty) => A full-day event
     # (set_time != empty) && (end_time == empty) => A malformed event
-    if ( $param{set_time} eq ':' ) {
+    if ( $param{set_time} eq '' || $param{set_time} eq ':' ) {
         $start = $start->truncate( to => 'day' );
         $end = $end->add( days => 1 )->truncate( to => 'day' );
         $this->is_full_day(1);
     }
-    elsif ( $param{end_time} eq ':' ) {
+    elsif ( $param{end_time} eq '' || $param{end_time} eq ':' ) {
         $end = $start->clone->add( minutes => 10 );
     }
@@ -63 +63 @@
     return
       unless $ymd
-          && (   $ymd =~ m!^(\d+)/(\d+)/(\d+)$!
-              || $ymd =~ m!^da\.(\d+)\.(\d+)\.(\d+)$! );
+          && ( $ymd =~ m!^da\.(\d+)\.(\d+)\.(\d+)$!
+              ||    $ymd =~ m!^(\d+)/(\d+)/(\d+)$! );
     @args{qw(year month day)} = ( $1, $2, $3 );