Changeset 518 for cybozu2ical/trunk/lib/WWW/CybozuOffice6/Calendar/RecurrentEvent.pm

Timestamp:

09/01/08 19:33:58 (4 months ago)

Author:

ogawa

Message:

Use accessors instead of directly accessing object fields.
Modify Event constructors' parameters so as to be subjected to Cybozu scripting.

Files:

• cybozu2ical/trunk/lib/WWW/CybozuOffice6/Calendar/RecurrentEvent.pm (modified) (4 diffs)

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

@@ -23 +23 @@
     n => 'WEEKDAYS'
 );
+our @WEEK_STRING = ( 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA' );
 
 sub parse {
@@ -28 +29 @@
     $this->SUPER::parse(%param);
 
-    # frequency
-    my $freq = $param{freq};
-    return unless $freq && exists $FREQUENCY{$freq};
+    my ( $type, $day ) = ( $param{type}, $param{day} );
+    return
+      unless defined $type
+          && ( $type =~ /^[1-5]$/ || exists $FREQUENCY{$type} );
+
+    ( $type, $day ) = ( 'm', $type . $WEEK_STRING[$day] )
+      if $type =~ /^[1-5]$/;
 
     # rrule
     my %rrule = ();
-    if ( $FREQUENCY{$freq} eq 'WEEKDAYS' ) {
+    if ( $FREQUENCY{$type} eq 'WEEKDAYS' ) {
         %rrule = ( FREQ => 'WEEKLY', BYDAY => 'MO,TU,WE,TH,FR' );
     }
     else {
-        %rrule = ( FREQ => $FREQUENCY{$freq} );
+        %rrule = ( FREQ => $FREQUENCY{$type} );
     }
-    if ( $param{freq_value} =~ /^\d(SU|MO|TU|WE|TH|FR|SA)$/ ) {
-        $rrule{BYDAY}    = $param{freq_value};
+    if ( $param{day} =~ /^\d(SU|MO|TU|WE|TH|FR|SA)$/ ) {
+        $rrule{BYDAY}    = $day;
         $rrule{INTERVAL} = 1;
     }
@@ -51 +56 @@
         my %args = ( year => $1, month => $2, day => $3 );
         my $until;
-        if ( $this->{is_full_day} ) {
+        if ( $this->is_full_day ) {
             $until = $this->to_datetime( $param{until_date}, ':' );
         }
         else {
-            $until = $this->{end}->clone->set(%args);
+            $until = $this->end->clone->set(%args);
             $until->set_time_zone('UTC');    # timezone must be UTC
         }
@@ -61 +66 @@
     }
 
-    $this->{rrule} = \%rrule;
+    $this->rrule( \%rrule );
 
     # exdates
-    if ( defined $param{exdates} ) {
+    if ( defined $param{exception} ) {
         my @exdates;
-        for ( @{ $param{exdates} } ) {
-            push @exdates, $this->to_datetime( $_, $param{start_time} );
+        for ( @{ $param{exception} } ) {
+            push @exdates, $this->to_datetime( $_, $param{set_time} );
         }
-        $this->{exdates} = \@exdates;
+        $this->exdates( \@exdates );
     }
 
     # for compatibility
-    $this->{frequency}       = $FREQUENCY{$freq};
-    $this->{frequency_value} = $param{freq_value} || 0;
-    $this->{until}           = $rrule{UNTIL} if exists $rrule{UNTIL};
+    $this->frequency( $FREQUENCY{$type} );
+    $this->frequency_value( $day || 0 );
+    $this->until( $rrule{UNTIL} ) if exists $rrule{UNTIL};
 
     1;