4 files changed, 62 insertions, 8 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
@@ -1117,17 +1117,22 @@ static VObject *createVObject( const OContact &c )
     emails.prepend( c.defaultEmail() );
     for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
         VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
         safeAddProp( email, VCInternetProp );
     }
 
     safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
-    safeAddPropValue( vcard, VCBirthDateProp, TimeConversion::toString( c.birthday() ) );
+    // 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();
+            qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
+            safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
+    }
 
     if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
         VObject *org = safeAddProp( vcard, VCOrgProp );
         safeAddPropValue( org, VCOrgNameProp, c.company() );
         safeAddPropValue( org, VCOrgUnitProp, c.department() );
         safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
     }
 
@@ -1144,16 +1149,32 @@ static VObject *createVObject( const OContact &c )
 
     return vcard;
 }
 
 
 /*!
   \internal
 */
+static QDate convVCardDateToDate( const QString& datestr )
+{
+        int monthPos = datestr.find('-');
+        int dayPos = datestr.find('-', monthPos+1 );
+        if ( monthPos == -1 || dayPos == -1 ) {
+                qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
+                return QDate();
+        }
+        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 );
+        qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
+        return date;
+}
+
 static OContact parseVObject( VObject *obj )
 {
     OContact c;
 
     VObjectIterator it;
     initPropIterator( &it, obj );
     while( moreIteration( &it ) ) {
         VObject *o = nextVObject( &it );
@@ -1343,19 +1364,23 @@ static OContact parseVObject( VObject *obj )
         else if ( name == "X-Qtopia-Anniversary" ) {
             c.setAnniversary( TimeConversion::fromString( value ) );
         }
         else if ( name == "X-Qtopia-Nickname" ) {
             c.setNickname( value );
         }
         else if ( name == "X-Qtopia-Children" ) {
             c.setChildren( value );
+                }
+        else if ( name == VCBirthDateProp ) {
+                // Reading Birthdate regarding RFC 2425 (5.8.4)
+                c.setBirthday( convVCardDateToDate( value ) );
+                
         }
 
-
 #if 0
         else {
             printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
@@ -1602,8 +1627,9 @@ void OContact::setDefaultEmail( const QString &v )
         
 }
 
 void OContact::insertEmails( const QStringList &v )
 {
     for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
         insertEmail( *it );
 }
+
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index 9e83150..382ab94 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -208,38 +208,39 @@ public:
 
     QString toShortText()const;
     QString OContact::type()const;
     QMap<QString,QString> OContact::toExtraMap() const;
     class QString OContact::recordField(int) const;
 
     // Why private ? (eilers,se)
     QString emailSeparator() const { return " "; }
-     // the emails should be seperated by a comma
+    // the emails should be seperated by a comma
     void setEmails( const QString &v );
     QString emails() const { return find( Qtopia::Emails ); }
 
 
 private:
     friend class AbEditor;
     friend class AbTable;
     friend class AddressBookAccessPrivate;
     friend class XMLIO;
 
-
     void insert( int key, const QString &value );
     void replace( int key, const QString &value );
     QString find( int key ) const;
 
     QString displayAddress( const QString &street,
                             const QString &city,
                             const QString &state,
                             const QString &zip,
                             const QString &country ) const;
 
     Qtopia::UidGen &uidGen() { return sUidGen; }
+
+
     static Qtopia::UidGen sUidGen;
     QMap<int, QString> mMap;
     ContactPrivate *d;
 };
 
 
 #endif
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 21fc088..734f5a2 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -1117,17 +1117,22 @@ static VObject *createVObject( const OContact &c )
     emails.prepend( c.defaultEmail() );
     for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
         VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
         safeAddProp( email, VCInternetProp );
     }
 
     safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
-    safeAddPropValue( vcard, VCBirthDateProp, TimeConversion::toString( c.birthday() ) );
+    // 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();
+            qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
+            safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
+    }
 
     if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
         VObject *org = safeAddProp( vcard, VCOrgProp );
         safeAddPropValue( org, VCOrgNameProp, c.company() );
         safeAddPropValue( org, VCOrgUnitProp, c.department() );
         safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
     }
 
@@ -1144,16 +1149,32 @@ static VObject *createVObject( const OContact &c )
 
     return vcard;
 }
 
 
 /*!
   \internal
 */
+static QDate convVCardDateToDate( const QString& datestr )
+{
+        int monthPos = datestr.find('-');
+        int dayPos = datestr.find('-', monthPos+1 );
+        if ( monthPos == -1 || dayPos == -1 ) {
+                qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
+                return QDate();
+        }
+        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 );
+        qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
+        return date;
+}
+
 static OContact parseVObject( VObject *obj )
 {
     OContact c;
 
     VObjectIterator it;
     initPropIterator( &it, obj );
     while( moreIteration( &it ) ) {
         VObject *o = nextVObject( &it );
@@ -1343,19 +1364,23 @@ static OContact parseVObject( VObject *obj )
         else if ( name == "X-Qtopia-Anniversary" ) {
             c.setAnniversary( TimeConversion::fromString( value ) );
         }
         else if ( name == "X-Qtopia-Nickname" ) {
             c.setNickname( value );
         }
         else if ( name == "X-Qtopia-Children" ) {
             c.setChildren( value );
+                }
+        else if ( name == VCBirthDateProp ) {
+                // Reading Birthdate regarding RFC 2425 (5.8.4)
+                c.setBirthday( convVCardDateToDate( value ) );
+                
         }
 
-
 #if 0
         else {
             printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
@@ -1602,8 +1627,9 @@ void OContact::setDefaultEmail( const QString &v )
         
 }
 
 void OContact::insertEmails( const QStringList &v )
 {
     for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
         insertEmail( *it );
 }
+
diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index 9e83150..382ab94 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -208,38 +208,39 @@ public:
 
     QString toShortText()const;
     QString OContact::type()const;
     QMap<QString,QString> OContact::toExtraMap() const;
     class QString OContact::recordField(int) const;
 
     // Why private ? (eilers,se)
     QString emailSeparator() const { return " "; }
-     // the emails should be seperated by a comma
+    // the emails should be seperated by a comma
     void setEmails( const QString &v );
     QString emails() const { return find( Qtopia::Emails ); }
 
 
 private:
     friend class AbEditor;
     friend class AbTable;
     friend class AddressBookAccessPrivate;
     friend class XMLIO;
 
-
     void insert( int key, const QString &value );
     void replace( int key, const QString &value );
     QString find( int key ) const;
 
     QString displayAddress( const QString &street,
                             const QString &city,
                             const QString &state,
                             const QString &zip,
                             const QString &country ) const;
 
     Qtopia::UidGen &uidGen() { return sUidGen; }
+
+
     static Qtopia::UidGen sUidGen;
     QMap<int, QString> mMap;
     ContactPrivate *d;
 };
 
 
 #endif