Changeset 328

Timestamp:

07/27/06 13:40:30 (2 years ago)

Author:

ogawa

Message:

Now can choose to use NCR encoding by config.yaml.
Add X-WR-TIMEZONE header.

Location:

cybozu2ical/trunk

Files:

• config.yaml.sample (modified) (1 diff)
• cybozu2ical (modified) (4 diffs)

cybozu2ical/trunk/config.yaml.sample

@@ -5 +5 @@
 time_zone: Asia/Tokyo
 tzname: JST
+input_encoding: shiftjis
+output_encoding: utf8

cybozu2ical/trunk/cybozu2ical

@@ -7 +7 @@
 use YAML;
 use LWP::UserAgent;
-use Encode qw/from_to decode_utf8 encode_utf8/;
+use Encode qw/from_to decode_utf8 encode/;
 use Text::CSV_XS;
 use Data::ICal;
@@ -18 +18 @@
 use Getopt::Long;
 
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 our $ENCODE_NCR = 0;
 
@@ -43 +43 @@
 
 my $content = $res->content;
-from_to($content, 'shiftjis', 'utf8');
+from_to($content, $cfg->{input_encoding} || 'shiftjis', 'utf8');
 my @lines = grep /^\d+,ts\.\d+,/, split(/\r?\n/, $content);
 
@@ -117 +117 @@
 $vcalendar->add_entry($vtimezone);
 
-print $ENCODE_NCR ?
+my $enc = $cfg->{output_encoding} || 'utf8';
+print ($enc eq 'ncr') ?
     encode_ncr($vcalendar->as_string) :
-    encode_utf8($vcalendar->as_string);
+    encode($enc, $vcalendar->as_string);
 
 sub encode_ncr {