maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ignore differences caused by exporting vCard with ADR;TYPE=PARCEL instead of ADR;TYPE=OTHER 

git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@295 15ad00c4-1369-45f4-8270-35d70d36bdcd
This commit is contained in:
Patrick Ohly 2006-12-09 16:25:30 +00:00
parent 548de95cfe
commit 7e374224d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/normalize_vcard.pl
View File

@ -47,7 +47,9 @@ sub Normalize {
# replace parameters with a sorted parameter list
s!^([^;:\n]*);(.*?):!$1 . ";" . join(';',sort(split(/;/, $2))) . ":"!meg;
# Ignore "other" email, address and telephone type - this is
# Map non-standard ADR;TYPE=OTHER to PARCEL, just like SyncEvolution does
s/^ADR;TYPE=OTHER/ADR;TYPE=PARCEL/mg;
# Ignore remaining "other" email, address and telephone type - this is
# an Evolution specific extension which might not be preserved.
s/^(ADR|EMAIL|TEL)([^:\n]*);TYPE=OTHER/$1$2/mg;
# TYPE=PREF on the other hand is not used by Evolution, but
@ -58,7 +60,6 @@ sub Normalize {
# ignore TYPE=PREF in address, does not matter in Evolution
s/^((ADR|LABEL)[^:\n]*);TYPE=PREF/$1/mg;
# ignore extra separators in multi-value fields
s/^((ORG|N|(ADR[^:\n]*?)):.*?);*$/$1/mg;
# the type of certain fields is ignore by Evolution
s/^X-(AIM|GROUPWISE|ICQ|YAHOO);TYPE=HOME/X-$1/gm;