summaryrefslogtreecommitdiff
path: root/libopie
authoreilers <eilers>2002-10-28 17:16:10 (UTC)
committer eilers <eilers>2002-10-28 17:16:10 (UTC)
commit0c4104a4870423b4220790b6ee734dff0cf60920 (patch) (side-by-side diff)
tree762e8841a58e6f9414e7281a50fb5a810566934e /libopie
parent098abdd59acd5a72127ac8abc9113238a53c546b (diff)
downloadopie-0c4104a4870423b4220790b6ee734dff0cf60920.zip
opie-0c4104a4870423b4220790b6ee734dff0cf60920.tar.gz
opie-0c4104a4870423b4220790b6ee734dff0cf60920.tar.bz2
Shit .. Microsoft is violating RFC 2426 .. Thanks a lot !
Diffstat (limited to 'libopie') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontact.cpp29
1 files changed, 21 insertions, 8 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 734f5a2..bf27d0f 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -573,3 +573,3 @@ QString OContact::toRichText() const
+ Qtopia::escapeString(str) + "<br>";
- if ( !birthday().isNull() ){
+ if ( !birthday().isValid() ){
str = TimeString::numberDateString( birthday() );
@@ -578,3 +578,3 @@ QString OContact::toRichText() const
}
- if ( !anniversary().isNull() ){
+ if ( !anniversary().isValid() ){
str = TimeString::numberDateString( anniversary() );
@@ -1125,4 +1125,12 @@ static VObject *createVObject( const OContact &c )
// Exporting Birthday regarding RFC 2425 (5.8.4)
- if ( !c.birthday().isNull() ){
- QString birthd_rfc2425 = c.birthday().year() + QString( "-" ) + c.birthday().month() + QString( "-" ) + c.birthday().day();
+ if ( !c.birthday().isValid() ){
+ QString birthd_rfc2425 = QString("%1-%2-%3")
+ .arg( c.birthday().year() )
+ .arg( c.birthday().month(), 2 )
+ .arg( c.birthday().day(), 2 );
+ // Now replace spaces with "0"...
+ int pos = 0;
+ while ( ( pos = birthd_rfc2425.find (' ') ) > 0 )
+ birthd_rfc2425.replace( pos, 1, "0" );
+
qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
@@ -1160,11 +1168,16 @@ static QDate convVCardDateToDate( const QString& datestr )
int dayPos = datestr.find('-', monthPos+1 );
+ int sep_ignore = 1;
if ( monthPos == -1 || dayPos == -1 ) {
qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
- return QDate();
+ // Ok.. Outlook is violating ISO 8601, therefore we will try to read their format ( YYYYMMDD )
+ monthPos = 4;
+ dayPos = 6;
+ sep_ignore = 0;
+ qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
}
int y = datestr.left( monthPos ).toInt();
- int m = datestr.mid( monthPos+1, dayPos - monthPos - 1 ).toInt();
- int d = datestr.mid( dayPos+1 ).toInt();
- QDate date ( y,m,d );
+ int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
+ int d = datestr.mid( dayPos + sep_ignore ).toInt();
qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
+ QDate date ( y,m,d );
return date;