# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1381451135 -32400
# Node ID 7dfd5644478b877a0be6272eda6340a08ed79a05
# Parent  12ddd9dd9fc6c15daa2b190712c1a3b691c63ab9
validation

diff -r 12ddd9dd9fc6 -r 7dfd5644478b Calcon.pm
--- a/Calcon.pm	Thu Jan 24 16:09:18 2013 +0900
+++ b/Calcon.pm	Fri Oct 11 09:25:35 2013 +0900
@@ -2890,7 +2890,7 @@
 #    if ($record{'date'}->is_allday() && $self->{'-fake-allday'}) {
 #	$record{'date'}=$record{'date'}->add($self->{'-time-for-allday'});
 #    }
-    my $dtstart = "\nDTSTART;TZID=$timezone:".$self->date($record{'date'});
+    my $dtstart = "\r\nDTSTART;TZID=$timezone:".$self->date($record{'date'});
     my $dtend = '';
     my $dtstamp = '';
 
@@ -2899,16 +2899,16 @@
 	    # $dtend = "\nDURATION:PT2H";  this is useless for iCal
 	    $record{'end-date'} = $record{'date'}->add(
 		$self->{'-add-time-for-allday'});
-	    $dtend = "\nDTEND;TZID=$timezone:".$self->date($record{'end-date'});
+	    $dtend = "\r\nDTEND;TZID=$timezone:".$self->date($record{'end-date'});
 	} else {
-	    $dtend = "\nDTEND;TZID=$timezone:".$self->date($record{'end-date'});
+	    $dtend = "\r\nDTEND;TZID=$timezone:".$self->date($record{'end-date'});
 	}
     } else {
         $dtend = '';
-        $dtstart =~ s/T000000$//; 
+        # $dtstart =~ s/T000000$//; 
     }
     if (defined( $record{'modify-date'})) {
-	$dtstamp = "\nDTSTAMP;TZID=$timezone:".$self->date($record{'modify-date'});
+	$dtstamp = "\r\nDTSTAMP:".$self->date($record{'modify-date'})."Z";
     }
 
     my $summary = '';
@@ -2926,7 +2926,7 @@
 	$description = "";
     } else {
 	if ($description) {
-	    $description = "\nDESCRIPTION: $description";
+	    $description = "\r\nDESCRIPTION: $description";
 	}
     }
     return if (! $description && ! $summary );
@@ -2937,11 +2937,11 @@
 # SEQUENCE:$i
 
     $self->print(<<"EOFEOF");
-BEGIN:VEVENT
-SUMMARY:$summary$dtstart$dtend$description$dtstamp
-END:VEVENT
+BEGIN:VEVENT\r
+SUMMARY:$summary$dtstart$dtend$description$dtstamp\r
+END:VEVENT\r
 EOFEOF
-#    print "\n";
+#    print "\r\n";
 }
 
 sub date {
@@ -2978,8 +2978,8 @@
 	$record{'end-time'} = $2;
     }
 
-    print "BEGIN:VCARD\n";
-    print "VERSION:3.0\n";
+    print "BEGIN:VCARD\r\n";
+    print "VERSION:3.0\r\n";
     if(defined $record{'name'}) {
 	$data =  $record{'name'};
 	if(0 && defined $record{'name-yomi'}) {
@@ -3012,7 +3012,7 @@
 	if(defined $record{'section'}) {
 	    $data .= ";".$record{'section'};
 	}
-	print "ORG:$data\n" if($data);
+	print "ORG:$data\r\n" if($data);
     }
     if(defined $record{'title'}) {
 	 $data = "$record{'title'}";
@@ -3033,19 +3033,19 @@
     }
     if(defined $record{'tel'}) {
 	$data =  $record{'tel'};
-	print "TEL;TYPE=WORK:$data\n" if($data);
+	print "TEL;TYPE=WORK:$data\r\n" if($data);
     }
     if(defined $record{'tel2'}) {
 	$data =  $record{'tel2'};
-	print "TEL;TYPE=CELL:$data\n" if($data);
+	print "TEL;TYPE=CELL:$data\r\n" if($data);
     }
     if(defined $record{'fax'}) {
 	$data =  $record{'fax'};
-	print "TEL;TYPE=FAX:$data\n" if($data);
+	print "TEL;TYPE=FAX:$data\r\n" if($data);
     }
     if(defined $record{'mail'}) {
 	$data =  $record{'mail'};
-	print "EMAIL;INTERNET:$data\n" if($data);
+	print "EMAIL;INTERNET:$data\r\n" if($data);
     } 
     if(defined $record{'memo'}) {
 	$data =  $record{'memo'};
@@ -3053,18 +3053,18 @@
     } 
     if(defined $record{'birth'}) {
 	$data =  $record{'birth'};
-	print "BDAY:".$data->date()."\n" if($data);
+	print "BDAY:".$data->date()."\r\n" if($data);
     }
     if(defined $record{'name-yomi'}) {
 	$data =  $record{'name-yomi'};
-	print "X-CUSTOM1:$data\n" if($data);
+	print "X-CUSTOM1:$data\r\n" if($data);
     }
     if(defined $record{'office-yomi'}) {
 	$data =  $record{'office-yomi'};
-	print "X-CUSTOM2:$data\n" if($data);
+	print "X-CUSTOM2:$data\r\n" if($data);
     }
-    print "END:VCARD\n";
-    print "\n";
+    print "END:VCARD\r\n";
+    print "\r\n";
 }
 
 #######################################################################/
@@ -3115,25 +3115,25 @@
     if(defined($record{'office-yomi'})) {
 	$record{'office-yomi'} =~ s/^ *//;
     }
-    $self->print("BEGIN:VCARD\n");
-    $self->print("VERSION:3.0\n");
+    $self->print("BEGIN:VCARD\r\n");
+    $self->print("VERSION:3.0\r\n");
     if(defined $record{'name'}) {
 	$data =  $record{'name'};
 	$self->print("FN:$data\n") if($data);
 	if(0 && defined $record{'name-yomi'}) {
 	    $data = join(";",split(/ /,$record{'name-yomi'}));
-	    $self->print("N:$data\n") if($data);
+	    $self->print("N:$data\r\n") if($data);
 	} else {
 	    $data = join(";",split(/ /,$data));
-	    $self->print("N:$data\n") if($data);
+	    $self->print("N:$data\r\n") if($data);
 	}
 	if(defined $record{'name-yomi'}) {
 	    my ($last , $first , $last_yomi , $first_yomi );
 	    $last = $first = $last_yomi = $first_yomi = '';
 	    ($last,$first) =  split(/ /,$record{'name'});
 	    ($last_yomi,$first_yomi) = split(/ /,$record{'name-yomi'}),
-	    $self->print("X-PHONETIC-LAST-NAME:$last_yomi\n");
-	    $self->print("X-PHONETIC-FIRST-NAME:$first_yomi\n");
+	    $self->print("X-PHONETIC-LAST-NAME:$last_yomi\r\n");
+	    $self->print("X-PHONETIC-FIRST-NAME:$first_yomi\r\n");
 	}
 
 	# print "fn:$data\n" if($data);
@@ -3145,11 +3145,11 @@
 #    my $cat = 0;
     if(defined $record{'group'}) {
 	 $data = "$record{'group'}";
-	$self->print("CATEGORIES:$data\n") if($data);
+	$self->print("CATEGORIES:$data\r\n") if($data);
     }
     if(defined $record{'office'}) {
 	 $data = "$record{'office'}";
-	$self->print("ORG:$data;\n") if($data);
+	$self->print("ORG:$data;\r\n") if($data);
 #	if ($cat==0) {
 #	    $self->print("CATEGORIES:$data\n") if($data);
 #	}
@@ -3159,8 +3159,8 @@
 	$title = $record{'section'};
     }
     if(defined $record{'title'}) {
-	 $title .= ($title?'\n':'')."$record{'title'}";
-	$self->print("TITLE:$data\n") if($data);
+	 $title .= ($title?'\r\n':'')."$record{'title'}";
+	$self->print("TITLE:$data\r\n") if($data);
     }
     if(defined $record{'address'}) {
 	my $i = $self->{'item'}++;
@@ -3177,27 +3177,27 @@
     if(defined $record{'tel'}) {
 	# my $i = $self->{'item'}++;
 	$data =  $record{'tel'};
-	$self->print("TEL;TYPE=WORK:$data\n") if($data);
+	$self->print("TEL;TYPE=WORK:$data\r\n") if($data);
     }
     if(defined $record{'mobile-tel'}) {
 	# my $i = $self->{'item'}++;
 	$data =  $record{'mobile-tel'};
-	$self->print("TEL;TYPE=CELL:$data\n") if($data);
+	$self->print("TEL;TYPE=CELL:$data\r\n") if($data);
     }
     if(defined $record{'home-tel'}) {
 	# my $i = $self->{'item'}++;
 	$data =  $record{'tel'};
-	$self->print("TEL;TYPE=HOME:$data\n") if($data);
+	$self->print("TEL;TYPE=HOME:$data\r\n") if($data);
     }
     if(defined $record{'tel2'}) {
 	# my $i = $self->{'item'}++;
 	$data =  $record{'tel2'};
-	$self->print("TEL;TYPE=CELL:$data\n") if($data);
+	$self->print("TEL;TYPE=CELL:$data\r\n") if($data);
     }
     if(defined $record{'fax'}) {
 	# my $i = $self->{'item'}++;
 	$data =  $record{'fax'};
-	$self->print( "TEL;TYPE=FAX:$data\n") if($data);
+	$self->print( "TEL;TYPE=FAX:$data\r\n") if($data);
     }
     if(defined $record{'home-address'}) {
 	my $i = $self->{'item'}++;
@@ -3215,20 +3215,20 @@
     if(defined $record{'mail2'}) {
 	# my $i = $self->{'item'}++;
 	$data =  $record{'mail2'};
-	$self->print("EMAIL;TYPE=internet;TYPE=HOME:$data\n") if($data);
+	$self->print("EMAIL;TYPE=internet;TYPE=HOME:$data\r\n") if($data);
     } 
     if(defined $record{'mail'}) {
 	# my $i = $self->{'item'}++;
 	$data =  $record{'mail'};
-	$self->print("EMAIL;TYPE=internet;TYPE=PREF:$data\n") if($data);
+	$self->print("EMAIL;TYPE=internet;TYPE=PREF:$data\r\n") if($data);
     } 
     if(defined $record{'birth'}) {
 	$data =  $record{'birth'};
-	$self->print("BDAY:".$data->date()."\n") if($data);
+	$self->print("BDAY:".$data->date()."\r\n") if($data);
     }
     if(defined $record{'memo'}) {
 	$data =  $record{'memo'};
-	$self->print("NOTE:$data\n") if($data);
+	$self->print("NOTE:$data\r\n") if($data);
     }
 #    if(defined $record{'name-yomi'}) {
 #	$data =  $record{'name-yomi'};
@@ -3238,8 +3238,8 @@
 #	$data =  $record{'office-yomi'};
 #	$self->print "x-custom2:$data\n" if($data);
 #    }
-    $self->print("END:VCARD\n");
-    $self->print("\n");
+    $self->print("END:VCARD\r\n");
+    $self->print("\r\n");
 }
 
 package Calcon::Vcard_N702iD_write;