4 files changed, 56 insertions, 26 deletions

diff --git a/libopie/pim/ocontactaccessbackend_vcard.cpp b/libopie/pim/ocontactaccessbackend_vcard.cpp
index 09ae37b..ca9e410 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.cpp
+++ b/libopie/pim/ocontactaccessbackend_vcard.cpp
@@ -8,24 +8,27 @@
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo:
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.5  2002/12/07 13:26:22  eilers
+ * Fixing bug in storing anniversary..
+ *
  * Revision 1.4  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.3  2002/11/11 16:41:09  kergoth
  * no default arguments in implementation
  *
  * Revision 1.2  2002/11/10 15:41:53  eilers
  * Bugfixes..
  *
  * Revision 1.1  2002/11/09 14:34:52  eilers
  * Added VCard Backend.
  *
@@ -374,25 +377,25 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
                         c.setManager( value );
                 }
                 else if ( name == "X-Qtopia-Assistant" ) {
                         c.setAssistant( value );
                 }
                 else if ( name == "X-Qtopia-Spouse" ) {
                         c.setSpouse( value );
                 }
                 else if ( name == "X-Qtopia-Gender" ) {
                         c.setGender( value );
                 }
                 else if ( name == "X-Qtopia-Anniversary" ) {
-                        c.setAnniversary( TimeConversion::fromString( value ) );
+                        c.setAnniversary( convVCardDateToDate( 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 ) );
                         
                 }
@@ -485,58 +488,66 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
         
         QStringList emails = c.emailList();
         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() );
         
         // Exporting Birthday regarding RFC 2425 (5.8.4)
         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());
-                safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
+                qWarning("Exporting birthday as: %s", convDateToVCardDate( c.birthday() ).latin1() );
+                safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) );
         }
         
         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() );
         }
         
         // some values we have to export as custom fields
         safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
         safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
         safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
         
         safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() );
         safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() );
-        safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) );
+        if ( c.anniversary().isValid() ){
+                qWarning("Exporting anniversary as: %s", convDateToVCardDate( c.anniversary() ).latin1() );
+                safeAddPropValue( vcard, "X-Qtopia-Anniversary", convDateToVCardDate( c.anniversary() ) );
+        }
         safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
         safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
         
         return vcard;
 }
 
+QString OContactAccessBackend_VCard::convDateToVCardDate( const QDate& d ) const
+{
+                QString str_rfc2425 = QString("%1-%2-%3")
+                        .arg( d.year() )
+                        .arg( d.month(), 2 )
+                        .arg( d.day(), 2 );
+                // Now replace spaces with "0"...
+                int pos = 0;
+                while ( ( pos = str_rfc2425.find (' ')  ) > 0 )
+                        str_rfc2425.replace( pos, 1, "0" );
+                
+                return str_rfc2425;
+}
+
 QDate OContactAccessBackend_VCard::convVCardDateToDate( const QString& datestr )
 {
         int monthPos = datestr.find('-');
         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 );
                 // Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD )
                 if ( datestr.length() == 8 ){
                         monthPos   = 4;
                         dayPos     = 6;
                         sep_ignore = 0;
diff --git a/libopie/pim/ocontactaccessbackend_vcard.h b/libopie/pim/ocontactaccessbackend_vcard.h
index 4437756..236da00 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.h
+++ b/libopie/pim/ocontactaccessbackend_vcard.h
@@ -8,24 +8,27 @@
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo:
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.4  2002/12/07 13:26:22  eilers
+ * Fixing bug in storing anniversary..
+ *
  * Revision 1.3  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.2  2002/11/10 15:41:53  eilers
  * Bugfixes..
  *
  * Revision 1.1  2002/11/09 14:34:52  eilers
  * Added VCard Backend.
  *
  */
 #ifndef __OCONTACTACCESSBACKEND_VCARD_H_
 #define __OCONTACTACCESSBACKEND_VCARD_H_
@@ -53,22 +56,23 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
         QArray<int> allRecords() const;
         QArray<int> queryByExample ( const OContact &query, int settings );
         QArray<int> matchRegexp(  const QRegExp &r ) const;
 
         const uint querySettings();
         bool hasQuerySettings (uint querySettings) const;
         QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat );
         bool wasChangedExternally();
         
 private:
         OContact parseVObject( VObject* obj );
         VObject* createVObject( const OContact& c );
+        QString convDateToVCardDate( const QDate& c ) const;
         QDate convVCardDateToDate( const QString& datestr );
         VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value );
         VObject *safeAddProp( VObject* o, const char* prop);
         
         bool m_dirty : 1;
         QString m_file;
         QMap<int, OContact> m_map;
 };
 
 #endif
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index 09ae37b..ca9e410 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -8,24 +8,27 @@
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo:
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.5  2002/12/07 13:26:22  eilers
+ * Fixing bug in storing anniversary..
+ *
  * Revision 1.4  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.3  2002/11/11 16:41:09  kergoth
  * no default arguments in implementation
  *
  * Revision 1.2  2002/11/10 15:41:53  eilers
  * Bugfixes..
  *
  * Revision 1.1  2002/11/09 14:34:52  eilers
  * Added VCard Backend.
  *
@@ -374,25 +377,25 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
                         c.setManager( value );
                 }
                 else if ( name == "X-Qtopia-Assistant" ) {
                         c.setAssistant( value );
                 }
                 else if ( name == "X-Qtopia-Spouse" ) {
                         c.setSpouse( value );
                 }
                 else if ( name == "X-Qtopia-Gender" ) {
                         c.setGender( value );
                 }
                 else if ( name == "X-Qtopia-Anniversary" ) {
-                        c.setAnniversary( TimeConversion::fromString( value ) );
+                        c.setAnniversary( convVCardDateToDate( 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 ) );
                         
                 }
@@ -485,58 +488,66 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
         
         QStringList emails = c.emailList();
         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() );
         
         // Exporting Birthday regarding RFC 2425 (5.8.4)
         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());
-                safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
+                qWarning("Exporting birthday as: %s", convDateToVCardDate( c.birthday() ).latin1() );
+                safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) );
         }
         
         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() );
         }
         
         // some values we have to export as custom fields
         safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
         safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
         safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
         
         safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() );
         safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() );
-        safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) );
+        if ( c.anniversary().isValid() ){
+                qWarning("Exporting anniversary as: %s", convDateToVCardDate( c.anniversary() ).latin1() );
+                safeAddPropValue( vcard, "X-Qtopia-Anniversary", convDateToVCardDate( c.anniversary() ) );
+        }
         safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
         safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
         
         return vcard;
 }
 
+QString OContactAccessBackend_VCard::convDateToVCardDate( const QDate& d ) const
+{
+                QString str_rfc2425 = QString("%1-%2-%3")
+                        .arg( d.year() )
+                        .arg( d.month(), 2 )
+                        .arg( d.day(), 2 );
+                // Now replace spaces with "0"...
+                int pos = 0;
+                while ( ( pos = str_rfc2425.find (' ')  ) > 0 )
+                        str_rfc2425.replace( pos, 1, "0" );
+                
+                return str_rfc2425;
+}
+
 QDate OContactAccessBackend_VCard::convVCardDateToDate( const QString& datestr )
 {
         int monthPos = datestr.find('-');
         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 );
                 // Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD )
                 if ( datestr.length() == 8 ){
                         monthPos   = 4;
                         dayPos     = 6;
                         sep_ignore = 0;
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
index 4437756..236da00 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
@@ -8,24 +8,27 @@
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo:
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.4  2002/12/07 13:26:22  eilers
+ * Fixing bug in storing anniversary..
+ *
  * Revision 1.3  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.2  2002/11/10 15:41:53  eilers
  * Bugfixes..
  *
  * Revision 1.1  2002/11/09 14:34:52  eilers
  * Added VCard Backend.
  *
  */
 #ifndef __OCONTACTACCESSBACKEND_VCARD_H_
 #define __OCONTACTACCESSBACKEND_VCARD_H_
@@ -53,22 +56,23 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
         QArray<int> allRecords() const;
         QArray<int> queryByExample ( const OContact &query, int settings );
         QArray<int> matchRegexp(  const QRegExp &r ) const;
 
         const uint querySettings();
         bool hasQuerySettings (uint querySettings) const;
         QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat );
         bool wasChangedExternally();
         
 private:
         OContact parseVObject( VObject* obj );
         VObject* createVObject( const OContact& c );
+        QString convDateToVCardDate( const QDate& c ) const;
         QDate convVCardDateToDate( const QString& datestr );
         VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value );
         VObject *safeAddProp( VObject* o, const char* prop);
         
         bool m_dirty : 1;
         QString m_file;
         QMap<int, OContact> m_map;
 };
 
 #endif