Changeset 374

Timestamp:

06/15/07 20:02:37 (18 months ago)

Author:

ogawa

Message:

Add premilinary support for EXDATE.

Location:

cybozu2ical/trunk

Files:

• cybozu2ical (modified) (3 diffs)
• lib/WWW/CybozuOffice6/Calendar.pm (modified) (6 diffs)

cybozu2ical/trunk/cybozu2ical

@@ -20 +20 @@
 our $VERSION = '0.12';
 
+### TRICK (stop escaping for 'exdate' property)
+*Data::ICal::Property::_value_as_string = sub {
+    my $self = shift;
+    my $key = shift;
+    my $value = defined($self->value()) ? $self->value() : '';
+    
+    unless ($self->vcal10) {
+        my $lc_key = lc($key);
+        $value =~ s/\\/\\/gs;
+        $value =~ s/\Q;/\\;/gs unless ($lc_key eq 'rrule' || $lc_key eq 'exdate');
+        $value =~ s/,/\\,/gs unless ($lc_key eq 'rrule' || $lc_key eq 'exdate');
+        $value =~ s/\n/\\n/gs;
+        $value =~ s/\\N/\\N/gs;
+    }
+
+    return $value;
+
+};
+### END
+
 my %opt = (conf => 'config.yaml');
 GetOptions(\%opt, 'help', 'debug', 'conf=s') or pod2usage(2);
@@ -60 +80 @@
     # handle frequency
     if ($item->can('frequency')) {
+        # rrule
         my $freq = $item->frequency;
         my %rrules = $freq ne 'WEEKDAYS' ?
@@ -67 +88 @@
             if $item->until;
         $args{rrule} = join ';', map { $_ . '=' . $rrules{$_} } keys %rrules;
+
+        # exdate
+#       $args{exdate} = join ',', map { to_icaldate($_, 1) } $item->exdates
+#           if $item->exdates;
+        if ($item->exdates) {
+            if ($item->is_full_day) {
+                $args{exdate} = [join(',', map { to_icaldate($_, 1) } $item->exdates), { VALUE => 'DATE' }];
+            } else {
+                $args{exdate} = [join(',', map { to_icaldate($_, 0) } $item->exdates), { TZID => $time_zone }];
+            }
+        }
+
     }
 

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

@@ -52 +52 @@
             or die 'Failed to parse CSV input';
         my @fields = $csv->fields;
-        next if $#fields < 13; # num. of fields
+        my $num_fields = @fields - 1;
+        next if $num_fields < 13;
         $fields[1] =~ s/^ts\.//; # remove rubbish
 
@@ -59 +60 @@
         # [ 0] id?         | id?
         # [ 1] created     | created
-        # [ 2] <BLANK>     x start_date
-        # [ 3] start_date  x end_date
+        # [ 2] <BLANK>     x modified start_date
+        # [ 3] start_date  x start_date / end_date
         # [ 4] end_date    x until_date
         # [ 5] start_time  | start_time
@@ -81 +82 @@
             $item = WWW::CybozuOffice6::Calendar::Event->new(%param);
         } else {
-            @param{qw(start_date end_date until_date)} = @fields[2..4];
+            @param{qw(start_date end_date until_date)} = @fields[3,3,4];
+            if ($num_fields > 13) {
+                my @exdates = @fields[14..$num_fields];
+                $param{exdates} = \@exdates;
+            }
             $item = WWW::CybozuOffice6::Calendar::RecurrentEvent->new(%param);
         }
@@ -194 +199 @@
 sub until               { shift->_accessor('until',             @_) }
 
+sub exdates {
+    my $this = shift;
+    return unless $this->{exdates};
+    my $dates = $this->{exdates};
+    wantarray ? @$dates : @$dates[0];
+}
+
 our %FREQUENCY = ( y => 'YEARLY', m => 'MONTHLY', w => 'WEEKLY',
                    d => 'DAILY', n => 'WEEKDAYS' );
@@ -207 +219 @@
     $this->{frequency_value} = $param{freq_value} || 0;
 
+    # until
     if ($param{until_date} =~ m!^(\d+)/(\d+)/(\d+)$!) {
         my %args = (year => $1, month => $2, day => $3);
@@ -218 +231 @@
         $this->{until} = $until;
     }
+
+    # exdates
+    if (defined $param{exdates}) {
+        my @dates;
+        for (@{$param{exdates}}) {
+            push @dates, $this->to_datetime($_, $param{start_time});
+        }
+        $this->{exdates} = \@dates;
+    }
+
     1;
 }