Changeset 449 for cybozu2ical/trunk/lib/WWW

Timestamp:

10/17/07 04:38:39 (15 months ago)

Author:

ogawa

Message:

Employs Carp module for WWW::CybozuOffice?6::Calendar.
Now supports Text::CSV module as well as Text::CSV_XS.

Files:

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

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

@@ -5 +5 @@
 use warnings;
 
+use Carp;
 use Encode qw/from_to/;
 use LWP::UserAgent;
 use URI;
 use DateTime;
-use Text::CSV_XS;
 
 our $VERSION = '0.20';
@@ -47 +47 @@
         Password   => $this->{password} || '',
     });
-    die 'Failed to access Cybozu Office 6: ' . $res->status_line
+    confess 'Failed to access Cybozu Office 6: ' . $res->status_line
         unless $res->is_success;
 
@@ -62 +62 @@
     my ($file) = @_;
     local *FH;
-    open FH, $file or die "Failed to read $file";
+    open FH, $file or confess "Failed to read $file";
     my @lines;
     while (<FH>) {
@@ -81 +81 @@
     my $this = shift;
 
+    my $csv;
+    if (eval('require Text::CSV_XS')) {
+        $csv = Text::CSV_XS->new({ binary => 1 });
+    } elsif (eval('require Text::CSV')) {
+        $csv = Text::CSV->new();
+    } else {
+        confess 'Text::CSV_XS or Text::CSV package is required';
+    }
+
     my @items;
-    my $csv = Text::CSV_XS->new({ binary => 1 });
     for my $line ($this->response) {
         $csv->parse($line)
-            or die 'Failed to parse CSV input';
+            or confess 'Failed to parse CSV input';
         my @fields = $csv->fields;
         my $num_fields = @fields - 1;