author | eilers <eilers> | 2002-10-28 13:41:31 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-28 13:41:31 (UTC) |
commit | d033fbaff92f1e8e89a96c69dadda068cf3177cd (patch) (unidiff) | |
tree | d23b6ee600ef7ac095a2ae191ac63436386351f6 /libopie/pim/ocontact.cpp | |
parent | 54b9d51694242a1f2e0c1898b05c56114827ca10 (diff) | |
download | opie-d033fbaff92f1e8e89a96c69dadda068cf3177cd.zip opie-d033fbaff92f1e8e89a96c69dadda068cf3177cd.tar.gz opie-d033fbaff92f1e8e89a96c69dadda068cf3177cd.tar.bz2 |
Vcard now exports date in correct format (Regarding RFC 2425).
Vcard now imports birthday..
-rw-r--r-- | libopie/pim/ocontact.cpp | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp index 21fc088..734f5a2 100644 --- a/libopie/pim/ocontact.cpp +++ b/libopie/pim/ocontact.cpp | |||
@@ -1113,25 +1113,30 @@ static VObject *createVObject( const OContact &c ) | |||
1113 | safeAddProp( title, VCWorkProp ); | 1113 | safeAddProp( title, VCWorkProp ); |
1114 | 1114 | ||
1115 | 1115 | ||
1116 | QStringList emails = c.emailList(); | 1116 | QStringList emails = c.emailList(); |
1117 | emails.prepend( c.defaultEmail() ); | 1117 | emails.prepend( c.defaultEmail() ); |
1118 | for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { | 1118 | for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { |
1119 | VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it ); | 1119 | VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it ); |
1120 | safeAddProp( email, VCInternetProp ); | 1120 | safeAddProp( email, VCInternetProp ); |
1121 | } | 1121 | } |
1122 | 1122 | ||
1123 | safeAddPropValue( vcard, VCNoteProp, c.notes() ); | 1123 | safeAddPropValue( vcard, VCNoteProp, c.notes() ); |
1124 | 1124 | ||
1125 | safeAddPropValue( vcard, VCBirthDateProp, TimeConversion::toString( c.birthday() ) ); | 1125 | // Exporting Birthday regarding RFC 2425 (5.8.4) |
1126 | if ( !c.birthday().isNull() ){ | ||
1127 | QString birthd_rfc2425 = c.birthday().year() + QString( "-" ) + c.birthday().month() + QString( "-" ) + c.birthday().day(); | ||
1128 | qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1()); | ||
1129 | safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() ); | ||
1130 | } | ||
1126 | 1131 | ||
1127 | if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) { | 1132 | if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) { |
1128 | VObject *org = safeAddProp( vcard, VCOrgProp ); | 1133 | VObject *org = safeAddProp( vcard, VCOrgProp ); |
1129 | safeAddPropValue( org, VCOrgNameProp, c.company() ); | 1134 | safeAddPropValue( org, VCOrgNameProp, c.company() ); |
1130 | safeAddPropValue( org, VCOrgUnitProp, c.department() ); | 1135 | safeAddPropValue( org, VCOrgUnitProp, c.department() ); |
1131 | safeAddPropValue( org, VCOrgUnit2Prop, c.office() ); | 1136 | safeAddPropValue( org, VCOrgUnit2Prop, c.office() ); |
1132 | } | 1137 | } |
1133 | 1138 | ||
1134 | // some values we have to export as custom fields | 1139 | // some values we have to export as custom fields |
1135 | safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() ); | 1140 | safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() ); |
1136 | safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() ); | 1141 | safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() ); |
1137 | safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() ); | 1142 | safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() ); |
@@ -1140,24 +1145,40 @@ static VObject *createVObject( const OContact &c ) | |||
1140 | safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() ); | 1145 | safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() ); |
1141 | safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) ); | 1146 | safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) ); |
1142 | safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() ); | 1147 | safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() ); |
1143 | safeAddPropValue( vcard, "X-Qtopia-Children", c.children() ); | 1148 | safeAddPropValue( vcard, "X-Qtopia-Children", c.children() ); |
1144 | 1149 | ||
1145 | return vcard; | 1150 | return vcard; |
1146 | } | 1151 | } |
1147 | 1152 | ||
1148 | 1153 | ||
1149 | /*! | 1154 | /*! |
1150 | \internal | 1155 | \internal |
1151 | */ | 1156 | */ |
1157 | static QDate convVCardDateToDate( const QString& datestr ) | ||
1158 | { | ||
1159 | int monthPos = datestr.find('-'); | ||
1160 | int dayPos = datestr.find('-', monthPos+1 ); | ||
1161 | if ( monthPos == -1 || dayPos == -1 ) { | ||
1162 | qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos ); | ||
1163 | return QDate(); | ||
1164 | } | ||
1165 | int y = datestr.left( monthPos ).toInt(); | ||
1166 | int m = datestr.mid( monthPos+1, dayPos - monthPos - 1 ).toInt(); | ||
1167 | int d = datestr.mid( dayPos+1 ).toInt(); | ||
1168 | QDate date ( y,m,d ); | ||
1169 | qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos); | ||
1170 | return date; | ||
1171 | } | ||
1172 | |||
1152 | static OContact parseVObject( VObject *obj ) | 1173 | static OContact parseVObject( VObject *obj ) |
1153 | { | 1174 | { |
1154 | OContact c; | 1175 | OContact c; |
1155 | 1176 | ||
1156 | VObjectIterator it; | 1177 | VObjectIterator it; |
1157 | initPropIterator( &it, obj ); | 1178 | initPropIterator( &it, obj ); |
1158 | while( moreIteration( &it ) ) { | 1179 | while( moreIteration( &it ) ) { |
1159 | VObject *o = nextVObject( &it ); | 1180 | VObject *o = nextVObject( &it ); |
1160 | QCString name = vObjectName( o ); | 1181 | QCString name = vObjectName( o ); |
1161 | QCString value = vObjectStringZValue( o ); | 1182 | QCString value = vObjectStringZValue( o ); |
1162 | if ( name == VCNameProp ) { | 1183 | if ( name == VCNameProp ) { |
1163 | VObjectIterator nit; | 1184 | VObjectIterator nit; |
@@ -1339,27 +1360,31 @@ static OContact parseVObject( VObject *obj ) | |||
1339 | } | 1360 | } |
1340 | else if ( name == "X-Qtopia-Gender" ) { | 1361 | else if ( name == "X-Qtopia-Gender" ) { |
1341 | c.setGender( value ); | 1362 | c.setGender( value ); |
1342 | } | 1363 | } |
1343 | else if ( name == "X-Qtopia-Anniversary" ) { | 1364 | else if ( name == "X-Qtopia-Anniversary" ) { |
1344 | c.setAnniversary( TimeConversion::fromString( value ) ); | 1365 | c.setAnniversary( TimeConversion::fromString( value ) ); |
1345 | } | 1366 | } |
1346 | else if ( name == "X-Qtopia-Nickname" ) { | 1367 | else if ( name == "X-Qtopia-Nickname" ) { |
1347 | c.setNickname( value ); | 1368 | c.setNickname( value ); |
1348 | } | 1369 | } |
1349 | else if ( name == "X-Qtopia-Children" ) { | 1370 | else if ( name == "X-Qtopia-Children" ) { |
1350 | c.setChildren( value ); | 1371 | c.setChildren( value ); |
1372 | } | ||
1373 | else if ( name == VCBirthDateProp ) { | ||
1374 | // Reading Birthdate regarding RFC 2425 (5.8.4) | ||
1375 | c.setBirthday( convVCardDateToDate( value ) ); | ||
1376 | |||
1351 | } | 1377 | } |
1352 | 1378 | ||
1353 | |||
1354 | #if 0 | 1379 | #if 0 |
1355 | else { | 1380 | else { |
1356 | printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) ); | 1381 | printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) ); |
1357 | VObjectIterator nit; | 1382 | VObjectIterator nit; |
1358 | initPropIterator( &nit, o ); | 1383 | initPropIterator( &nit, o ); |
1359 | while( moreIteration( &nit ) ) { | 1384 | while( moreIteration( &nit ) ) { |
1360 | VObject *o = nextVObject( &nit ); | 1385 | VObject *o = nextVObject( &nit ); |
1361 | QCString name = vObjectName( o ); | 1386 | QCString name = vObjectName( o ); |
1362 | QString value = vObjectStringZValue( o ); | 1387 | QString value = vObjectStringZValue( o ); |
1363 | printf(" subprop: %s = %s\n", name.data(), value.latin1() ); | 1388 | printf(" subprop: %s = %s\n", name.data(), value.latin1() ); |
1364 | } | 1389 | } |
1365 | } | 1390 | } |
@@ -1598,12 +1623,13 @@ void OContact::setDefaultEmail( const QString &v ) | |||
1598 | replace( Qtopia::DefaultEmail, e ); | 1623 | replace( Qtopia::DefaultEmail, e ); |
1599 | 1624 | ||
1600 | if ( !e.isEmpty() ) | 1625 | if ( !e.isEmpty() ) |
1601 | insertEmail( e ); | 1626 | insertEmail( e ); |
1602 | 1627 | ||
1603 | } | 1628 | } |
1604 | 1629 | ||
1605 | void OContact::insertEmails( const QStringList &v ) | 1630 | void OContact::insertEmails( const QStringList &v ) |
1606 | { | 1631 | { |
1607 | for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it ) | 1632 | for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it ) |
1608 | insertEmail( *it ); | 1633 | insertEmail( *it ); |
1609 | } | 1634 | } |
1635 | |||