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

vCard profile: added preliminary support for KAddressBook extensions

Browse source 
Problems yet to be solved:
  1) Support for KBC's custom fields.

  2) The 1st ; in ADR is causing it to leave out address as a blank....
    ADR;TYPE=dom;TYPE=home;TYPE=intl;TYPE=parcel;TYPE=postal;TYPE=pref;TYPE=work:123;;Planet Earth;Planet Earth;Planet Earth;Planet Earth;Home

  3) "\" being expanded to "\\" and "," ot "\," in X-KADDRESSBOOK-CRYPTOPREF (not creating any problems though)

also URL is being deleted locally , but appearing remotely,
EMAIL is being replaced by FN , when tested against Ovi servers.
This commit is contained in:
Dinesh 2011-03-30 23:38:36 +05:30 committed by Patrick Ohly
parent 0cb2aa6a30
commit a3d7412972
2 changed files with 113 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/syncevo/configs/datatypes/00vcard-fieldlist.xml
View file

@ -68,6 +68,7 @@
<field name="WANTS_HTML" type="string" compare="conflict"/>
<!-- chat handles: should be turned into one array, like WEB and CALURI/FBURL -->
<field name="IM_ADDRESS" array="yes" type="string" compare="conflict"/>
<field name="AIM_HANDLE" array="yes" type="string" compare="conflict"/>
<field name="AIM_SLOT" array="yes" type="string" compare="conflict"/>
<field name="GADUGADU_HANDLE" array="yes" type="string" compare="conflict"/>
@ -86,6 +87,9 @@
<field name="SKYPE_SLOT" array="yes" type="string" compare="conflict"/>
<field name="SIP_HANDLE" array="yes" type="string" compare="conflict"/>
<field name="SIP_SLOT" array="yes" type="string" compare="conflict"/>
<field name="MEANWHILE_HANDLE" array="yes" type="string" compare="conflict"/>
<field name="IRC_HANDLE" array="yes" type="string" compare="conflict"/>
<field name="SMS_HANDLE" array="yes" type="string" compare="conflict"/>
<!-- home address -->
<field name="ADR_STREET" array="yes" type="multiline" compare="conflict"/>
@ -105,5 +109,11 @@
<!-- Photo -->
<field name="PHOTO" type="blob" compare="never" merge="fillempty"/>
<field name="PHOTO_TYPE" type="integer" compare="never" merge="fillempty"/>
<!-- Crypto fields for KAddressbook -->
<field name="CRYPTOENCRYPTPREF" type="string" compare="conflict"/>
<field name="CRYPTOPROTOPREF" array="yes" type="string" compare="conflict"/>
<field name="CRYPTOSIGNPREF" type="string" compare="conflict"/>
<field name="OPENPGPFP" type="string" compare="conflict"/>
</fieldlist>

116
src/syncevo/configs/datatypes/01vcard-profile.xml
View file

@ -59,10 +59,16 @@
<value index="2" field="ORG_OFFICE"/>
<value index="3" field="ORG_TEAM"/>
</property>
<property name="X-KADDRESSBOOK-X-Office" delayedparsing="1">
<value field="ORG_OFFICE"/>
</property>
<property name="ROLE">
<value field="ROLE"/>
</property>
<property name="X-KADDRESSBOOK-X-Profession" delayedparsing="1">
<value field="ROLE"/>
</property>
<property name="TEL">
<value field="TEL"/>
@ -133,12 +139,16 @@
<property name="FBURL" suppressempty="yes">
<value field="FBURL" show="yes"/>
</property>
<property name="X-EVOLUTION-BLOG-URL" suppressempty="yes">
<property name="X-EVOLUTION-BLOG-URL" suppressempty="yes" rule="KDE"/>
<property name="X-EVOLUTION-BLOG-URL" suppressempty="yes" rule="other">
<value field="BLOGURL" show="yes"/>
</property>
<property name="X-EVOLUTION-VIDEO-URL" suppressempty="yes">
<value field="VIDEOURL" show="yes"/>
</property>
<property name="X-KADDRESSBOOK-BlogFeed" suppressempty="yes" delayedparsing="1">
<value field="BLOGURL" show="yes"/>
</property>
<!-- item for SyncML server: EVOLUTION rule not active,
both X-EVOLUTION-MANAGER and X-MANAGER are sent.
@ -153,34 +163,54 @@
item to/from Evolution: EVOLUTION rule is active,
only X-EVOLUTION-MANAGER is used. -->
<property name="X-EVOLUTION-MANAGER" suppressempty="yes" delayedparsing="1">
<property name="X-KADDRESSBOOK-X-ManagersName" suppressempty="yes" delayedparsing="1">
<value field="MANAGER" show="yes"/>
</property>
<property name="X-EVOLUTION-MANAGER" suppressempty="yes" delayedparsing="1" rule="KDE"/>
<property name="X-EVOLUTION-MANAGER" suppressempty="yes" delayedparsing="1" rule="other">
<value field="MANAGER" show="yes"/>
</property>
<property name="X-MANAGER" suppressempty="yes" rule="EVOLUTION"/> <!-- disables the X-MANAGER for EVOLUTION -->
<property name="X-MANAGER" suppressempty="yes" rule="KDE"/> <!-- disables the X-MANAGER for Akonadi -->
<property name="X-MANAGER" suppressempty="yes" rule="other">
<value field="MANAGER" show="yes"/>
</property>
<property name="X-EVOLUTION-ASSISTANT" suppressempty="yes" delayedparsing="1">
<property name="X-KADDRESSBOOK-X-AssistantsName" suppressempty="yes" delayedparsing="1">
<value field="ASSISTANT" show="yes"/>
</property>
<property name="X-EVOLUTION-ASSISTANT" suppressempty="yes" delayedparsing="1" rule="KDE"/>
<property name="X-EVOLUTION-ASSISTANT" suppressempty="yes" delayedparsing="1" rule="other">
<value field="ASSISTANT" show="yes"/>
</property>
<property name="X-ASSISTANT" suppressempty="yes" rule="EVOLUTION"/>
<property name="X-ASSISTANT" suppressempty="yes" rule="KDE"/>
<property name="X-ASSISTANT" suppressempty="yes" rule="other">
<value field="ASSISTANT" show="yes"/>
</property>
<property name="X-EVOLUTION-SPOUSE" suppressempty="yes" delayedparsing="1">
<property name="X-KADDRESSBOOK-X-SpousesName" suppressempty="yes" delayedparsing="1">
<value field="SPOUSE" show="yes"/>
</property>
<property name="X-EVOLUTION-SPOUSE" suppressempty="yes" delayedparsing="1" rule ="KDE"/>
<property name="X-EVOLUTION-SPOUSE" suppressempty="yes" delayedparsing="1" rule ="other">
<value field="SPOUSE" show="yes"/>
</property>
<property name="X-SPOUSE" suppressempty="yes" rule="EVOLUTION"/>
<property name="X-SPOUSE" suppressempty="yes" rule="KDE"/>
<property name="X-SPOUSE" suppressempty="yes" rule="other">
<value field="SPOUSE" show="yes"/>
</property>
<property name="X-EVOLUTION-ANNIVERSARY" suppressempty="yes" delayedparsing="1">
<property name="X-KADDRESSBOOK-X-Anniversary" suppressempty="yes" delayedparsing="1">
<value field="ANNIVERSARY" show="yes"/>
</property>
<property name="X-EVOLUTION-ANNIVERSARY" suppressempty="yes" delayedparsing="1" rule="KDE"/>
<property name="X-EVOLUTION-ANNIVERSARY" suppressempty="yes" delayedparsing="1" rule="other">
<value field="ANNIVERSARY" show="yes"/>
</property>
<property name="X-ANNIVERSARY" suppressempty="yes" rule="EVOLUTION"/>
<property name="X-ANNIVERSARY" suppressempty="yes" rule="KDE"/>
<property name="X-ANNIVERSARY" suppressempty="yes" rule="other">
<value field="ANNIVERSARY" show="yes"/>
</property>
@ -189,50 +219,85 @@
<value field="WANTS_HTML" show="yes"/>
</property>
<property name="X-AIM" suppressempty="yes">
<property name="X-KADDRESSBOOK-X-IMAddress" suppressempty="yes">
<value field="IM_ADDRESS" show="yes"/>
</property>
<property name="X-messaging/aim-All" suppressempty="yes" delayedparsing="1">
<value field="AIM_HANDLE"/>
</property>
<property name="X-AIM" suppressempty="yes" rule="KDE"/>
<property name="X-AIM" suppressempty="yes" rule="other">
<value field="AIM_HANDLE"/>
<parameter name="X-EVOLUTION-UI-SLOT" positional="no" show="no" rule="HAVE-EVOLUTION-UI-SLOT">
<value field="AIM_SLOT"/>
</parameter>
</property>
<property name="X-GADUGADU" suppressempty="yes">
<property name="X-messaging/gadu-All" suppressempty="yes" delayedparsing="1">
<value field="GADUGADU_HANDLE"/>
</property>
<property name="X-GADUGADU" suppressempty="yes" rule="KDE"/>
<property name="X-GADUGADU" suppressempty="yes" rule="other">
<value field="GADUGADU_HANDLE"/>
<parameter name="X-EVOLUTION-UI-SLOT" positional="no" show="no" rule="HAVE-EVOLUTION-UI-SLOT">
<value field="GADUGADU_SLOT"/>
</parameter>
</property>
<property name="X-GROUPWISE" suppressempty="yes">
<property name="X-messaging/groupwise-All" suppressempty="yes" delayedparsing="1">
<value field="GROUPWISE_HANDLE"/>
</property>
<property name="X-GROUPWISE" suppressempty="yes" rule="KDE"/>
<property name="X-GROUPWISE" suppressempty="yes" rule="other">
<value field="GROUPWISE_HANDLE"/>
<parameter name="X-EVOLUTION-UI-SLOT" positional="no" show="no" rule="HAVE-EVOLUTION-UI-SLOT">
<value field="GROUPWISE_SLOT"/>
</parameter>
</property>
<property name="X-ICQ" suppressempty="yes">
<property name="X-messaging/icq-All" suppressempty="yes" delayedparsing="1">
<value field="ICQ_HANDLE"/>
</property>
<property name="X-ICQ" suppressempty="yes" rule="KDE"/>
<property name="X-ICQ" suppressempty="yes" rule="other">
<value field="ICQ_HANDLE"/>
<parameter name="X-EVOLUTION-UI-SLOT" positional="no" show="no" rule="HAVE-EVOLUTION-UI-SLOT">
<value field="ICQ_SLOT"/>
</parameter>
</property>
<property name="X-JABBER" suppressempty="yes">
<property name="X-messaging/xmpp-All" suppressempty="yes" delayedparsing="1">
<value field="JABBER_HANDLE"/>
</property>
<property name="X-JABBER" suppressempty="yes" rule="KDE"/>
<property name="X-JABBER" suppressempty="yes" rule="other">
<value field="JABBER_HANDLE"/>
<parameter name="X-EVOLUTION-UI-SLOT" positional="no" show="no">
<value field="JABBER_SLOT"/>
</parameter>
</property>
<property name="X-MSN" suppressempty="yes">
<property name="X-messaging/msn-All" suppressempty="yes" delayedparsing="1">
<value field="MSN_HANDLE"/>
</property>
<property name="X-MSN" suppressempty="yes" rule="KDE"/>
<property name="X-MSN" suppressempty="yes" rule="other">
<value field="MSN_HANDLE"/>
<parameter name="X-EVOLUTION-UI-SLOT" positional="no" show="no" rule="HAVE-EVOLUTION-UI-SLOT">
<value field="MSN_SLOT"/>
</parameter>
</property>
<property name="X-YAHOO" suppressempty="yes">
<property name="X-messaging/yahoo-All" suppressempty="yes" delayedparsing="1">
<value field="YAHOO_HANDLE"/>
</property>
<property name="X-YAHOO" suppressempty="yes" rule="KDE"/>
<property name="X-YAHOO" suppressempty="yes" rule="other">
<value field="YAHOO_HANDLE"/>
<parameter name="X-EVOLUTION-UI-SLOT" positional="no" show="no" rule="HAVE-EVOLUTION-UI-SLOT">
<value field="YAHOO_SLOT"/>
</parameter>
</property>
<property name="X-SKYPE" suppressempty="yes">
<property name="X-messaging/skype-All" suppressempty="yes" delayedparsing="1">
<value field="SKYPE_HANDLE"/>
</property>
<property name="X-SKYPE" suppressempty="yes" rule="KDE"/>
<property name="X-SKYPE" suppressempty="yes" rule="other">
<value field="SKYPE_HANDLE"/>
<parameter name="X-EVOLUTION-UI-SLOT" positional="no" show="no" rule="HAVE-EVOLUTION-UI-SLOT">
<value field="SKYPE_SLOT"/>
@ -246,6 +311,17 @@
</parameter>
</property>
<property name="X-messaging/irc-All" suppressempty="yes">
<value field="IRC_HANDLE"/>
</property>
<property name="X-messaging/meanwhile-All" suppressempty="yes">
<value field="MEANWHILE_HANDLE"/>
</property>
<property name="X-messaging/sms-All" suppressempty="yes">
<value field="SMS_HANDLE"/>
</property>
<property name="ADR" values="7">
<value index="0" field="ADR_POBOX"/>
<value index="1" field="ADR_ADDTL"/>
@ -288,5 +364,19 @@
</parameter>
</property>
<property name="X-KADDRESSBOOK-CRYPTOENCRYPTPREF" suppressempty="yes">
<value field="CRYPTOENCRYPTPREF" show="yes"/>
</property>
<property name="X-KADDRESSBOOK-CRYPTOPROTOPREF" suppressempty="yes">
<value field="CRYPTOPROTOPREF" show="yes"/>
</property>
<property name="X-KADDRESSBOOK-CRYPTOSIGNPREF" suppressempty="yes">
<value field="CRYPTOSIGNPREF" show="yes"/>
</property>
<property name="X-KADDRESSBOOK-OPENPGPFP" suppressempty="yes">
<value field="OPENPGPFP" show="yes"/>
</property>
</profile>
</mimeprofile>