Mercurial > hg > Applications > Calcon

changeset 18:12ddd9dd9fc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use BEGIN:VCARD to make OS X happy
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 24 Jan 2013 16:09:18 +0900
parents 1fc0675b44cd
children 7dfd5644478b
files Calcon.pm pool.pl
diffstat 2 files changed, 35 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/Calcon.pm	Fri Sep 02 18:29:56 2011 +0900
+++ b/Calcon.pm	Thu Jan 24 16:09:18 2013 +0900
@@ -374,7 +374,7 @@
 
 sub tomorrow {
     my ($self) = @_;
-    return ( $today+24*3600*2 >= $$self && $$self >= $today-24*3600/2);
+    return ( $today+24*3600*4 >= $$self && $$self >= $today+24*3600);
 }
 
 sub is_weekday {
@@ -2978,11 +2978,10 @@
 	$record{'end-time'} = $2;
     }
 
-    print "begin:vcard\n";
-    print "version:3.0\n";
+    print "BEGIN:VCARD\n";
+    print "VERSION:3.0\n";
     if(defined $record{'name'}) {
 	$data =  $record{'name'};
-	print "FN:$data\n" if($data);
 	if(0 && defined $record{'name-yomi'}) {
 	    $data = join(";",split(/ /,$record{'name-yomi'}));
 	    print "N:$data\n" if($data);
@@ -2990,6 +2989,7 @@
 	    $data = join(";",split(/ /,$data));
 	    print "N:$data\n" if($data);
 	}
+	print "FN:$data\n" if($data);
 	if(defined $record{'name-yomi'}) {
 	    my ($last , $first , $last_yomi , $first_yomi );
 	    $last = $first = $last_yomi = $first_yomi = '';
@@ -3012,11 +3012,11 @@
 	if(defined $record{'section'}) {
 	    $data .= ";".$record{'section'};
 	}
-	print "org:$data\n" if($data);
+	print "ORG:$data\n" if($data);
     }
     if(defined $record{'title'}) {
 	 $data = "$record{'title'}";
-	print "title:$data\n" if($data);
+	print "TITLE:$data\n" if($data);
     }
     if(defined $record{'address'}) {
 	my ($adr1 , $adr2 , $adr_state , $adr_zip , $adr_country ); 
@@ -3028,42 +3028,42 @@
 	    $adr_zip = $record{'zip'};
 	}
 #	    print "adr;type=work;type=pref:$data\n" if($data);
-print "adr;type=work;type=pref:;;$adr1;$adr2;$adr_state;$adr_zip;$adr_country\n" if ($data);
-	print "label;type=work;type=pref:$adr_zip $data\n" if($data);
+print "ADR;TYPE=WORK;TYPE=PREF:;;$adr1;$adr2;$adr_state;$adr_zip;$adr_country\n" if ($data);
+	print "LABEL;TYPE=WORK;TYPE=PREF:$adr_zip $data\n" if($data);
     }
     if(defined $record{'tel'}) {
 	$data =  $record{'tel'};
-	print "tel;type=work:$data\n" if($data);
+	print "TEL;TYPE=WORK:$data\n" if($data);
     }
     if(defined $record{'tel2'}) {
 	$data =  $record{'tel2'};
-	print "tel;type=cell:$data\n" if($data);
+	print "TEL;TYPE=CELL:$data\n" if($data);
     }
     if(defined $record{'fax'}) {
 	$data =  $record{'fax'};
-	print "tel;type=fax:$data\n" if($data);
+	print "TEL;TYPE=FAX:$data\n" if($data);
     }
     if(defined $record{'mail'}) {
 	$data =  $record{'mail'};
-	print "email;internet:$data\n" if($data);
+	print "EMAIL;INTERNET:$data\n" if($data);
     } 
     if(defined $record{'memo'}) {
 	$data =  $record{'memo'};
-	print "note:$data\n" if($data);
+	print "NOTE:$data\n" if($data);
     } 
     if(defined $record{'birth'}) {
 	$data =  $record{'birth'};
-	print "bday:".$data->date()."\n" if($data);
+	print "BDAY:".$data->date()."\n" if($data);
     }
     if(defined $record{'name-yomi'}) {
 	$data =  $record{'name-yomi'};
-	print "x-custom1:$data\n" if($data);
+	print "X-CUSTOM1:$data\n" if($data);
     }
     if(defined $record{'office-yomi'}) {
 	$data =  $record{'office-yomi'};
-	print "x-custom2:$data\n" if($data);
+	print "X-CUSTOM2:$data\n" if($data);
     }
-    print "end:vcard\n";
+    print "END:VCARD\n";
     print "\n";
 }
 
@@ -3115,8 +3115,8 @@
     if(defined($record{'office-yomi'})) {
 	$record{'office-yomi'} =~ s/^ *//;
     }
-    $self->print("begin:vcard\n");
-    $self->print("version:3.0\n");
+    $self->print("BEGIN:VCARD\n");
+    $self->print("VERSION:3.0\n");
     if(defined $record{'name'}) {
 	$data =  $record{'name'};
 	$self->print("FN:$data\n") if($data);
@@ -3160,7 +3160,7 @@
     }
     if(defined $record{'title'}) {
 	 $title .= ($title?'\n':'')."$record{'title'}";
-	$self->print("title:$data\n") if($data);
+	$self->print("TITLE:$data\n") if($data);
     }
     if(defined $record{'address'}) {
 	my $i = $self->{'item'}++;
@@ -3172,32 +3172,32 @@
 	if(defined $record{'zip'}) {
 	    $adr_zip = $record{'zip'};
 	}
-$self->print("item$i.ADR;type=work;type=pref:;;$adr1;$adr2;$adr_state;$adr_zip;$adr_country\n") if ($data);
+$self->print("ITEM$i.ADR;TYPE=WORK;TYPE=PREF:;;$adr1;$adr2;$adr_state;$adr_zip;$adr_country\n") if ($data);
     }
     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\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\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\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\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\n") if($data);
     }
     if(defined $record{'home-address'}) {
 	my $i = $self->{'item'}++;
@@ -3209,22 +3209,22 @@
 	if(defined $record{'home-zip'}) {
 	    $adr_zip = $record{'home-zip'};
 	}
-$self->print("item$i.ADR;type=home;type=pref:;;$adr1;$adr2;$adr_state;$adr_zip;$adr_country\n") if ($data);
+$self->print("ITEM$i.ADR;TYPE=HOME;TYPE=PREF:;;$adr1;$adr2;$adr_state;$adr_zip;$adr_country\n") if ($data);
 	# $self->print("item$1.X-ABADR:ja\n") if ($data);
     }
     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\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\n") if($data);
     } 
     if(defined $record{'birth'}) {
 	$data =  $record{'birth'};
-	$self->print("bday:".$data->date()."\n") if($data);
+	$self->print("BDAY:".$data->date()."\n") if($data);
     }
     if(defined $record{'memo'}) {
 	$data =  $record{'memo'};
@@ -3238,7 +3238,7 @@
 #	$data =  $record{'office-yomi'};
 #	$self->print "x-custom2:$data\n" if($data);
 #    }
-    $self->print("end:vcard\n");
+    $self->print("END:VCARD\n");
     $self->print("\n");
 }
 
@@ -4246,8 +4246,9 @@
 } elsif (/^tel(.*):\s*(.*)/i) { $self->items($record,'tel',$1,$2);
 } elsif (/^title:\s*/i) { $record->{'title'} = $1;
 } elsif (/^version:\s*(.*)/i) { $record->{'version'} = $1;
-} elsif (/^X-PHONETIC-LAST-NAME:\s*(.*)/i) { $record->{'name-yomi'} .= "$1 ";
-} elsif (/^X-PHONETIC-FIRST-NAME:\s*(.*)/i) { $record->{'name-yomi'} .= "$1 ";
+} elsif (/^SORT\-STRING:\s*(.*)/i) { $record->{'name-yomi'} .= "$1 ";
+} elsif (/^X\-PHONETIC\-LAST\-NAME:\s*(.*)/i) { $record->{'name-yomi'} .= "$1 ";
+} elsif (/^X\-PHONETIC\-FIRST\-NAME:\s*(.*)/i) { $record->{'name-yomi'} .= "$1 ";
 } elsif (/^SOUND.*:\s*(.*)/i) { $record->{'name-yomi'} .= "$1 "; 
     $record->{'name-yomi'} =~ s/;/ /g;
 } elsif (/^x-custom1:\s*(.*)/i) { $record->{'name-yomi'} = $1;
--- a/pool.pl	Fri Sep 02 18:29:56 2011 +0900
+++ b/pool.pl	Thu Jan 24 16:09:18 2013 +0900
@@ -77,6 +77,7 @@
 	$file = shift(@ARGV);
 	$first_flag = 0;
     } else {
+        print STDERR "bad option $file\n";
 	&usage_die();
 
 #