Changeset 518 for cybozu2ical/trunk/lib/WWW/CybozuOffice6/CalendarDriver/ApiCalendar.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/CalendarDriver/ApiCalendar.pm (modified) (2 diffs)

cybozu2ical/trunk/lib/WWW/CybozuOffice6/CalendarDriver/ApiCalendar.pm

@@ -86 +86 @@
         my $num_fields = @fields - 1;
         next if $num_fields < 14;
-        $fields[1] =~ s/^ts\.//;    # remove rubbish
 
         # Cybozu Calendar CSV Format
@@ -107 +106 @@
         my %param;
         @param{
-            qw(id created freq freq_value start_date end_date start_time end_time abbrev summary description)
+            qw(id timestamp type day set_date end_date set_time end_time event detail memo)
           } = @fields[ 0, 1, 4, 5, 8 .. 11, 12 .. 14 ];
 
         $param{time_zone} = $cal->{time_zone} || 'Asia/Tokyo';
 
+        if ( $num_fields > 14 ) {
+            my @exception = @fields[ 14 .. $num_fields ];
+            $param{exception} = \@exception;
+        }
+
         my $item;
-        if ( !$param{freq} ) {
+        if ( !$param{type} ) {
             $item = WWW::CybozuOffice6::Calendar::Event->new(%param);
         }
         else {
             @param{qw(end_date until_date)} = @fields[ 8, 9 ];
-            if ( $num_fields > 14 ) {
-                my @exdates = @fields[ 14 .. $num_fields ];
-                $param{exdates} = \@exdates;
-            }
-            my $freq = $param{freq};
-            if ( $freq =~ /^[1-5]$/ ) {
-                $param{freq} = 'm';
-                my @week_str = ( 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA' );
-                $param{freq_value} = $freq . $week_str[ $param{freq_value} ];
-            }
             $item = WWW::CybozuOffice6::Calendar::RecurrentEvent->new(%param);
         }