Fixing bug in storing anniversary..

2 files changed, 28 insertions, 13 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
@@ -4,32 +4,35 @@
  * Copyright (C) 2000 Trolltech AS.  All rights reserved.
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
  *	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.
  *
  */
 #include "ocontactaccessbackend_vcard.h"
 #include "../../library/backend/vobject_p.h"
 #include "../../library/backend/qfiledirect_p.h"
@@ -370,33 +373,33 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
 		else if ( name == "X-Qtopia-Profession" ) {
 			c.setProfession( value );
 		}
 		else if ( name == "X-Qtopia-Manager" ) {
 			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 ) );
 			
 		}
 		
 #if 0
 		else {
 			printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
@@ -481,66 +484,74 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
 	
 	VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
 	safeAddProp( title, VCWorkProp );
 	
 	
 	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;
 			qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
 		} else {
 			return QDate();
 		}
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
@@ -4,32 +4,35 @@
  * Copyright (C) 2000 Trolltech AS.  All rights reserved.
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
  *	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_
 
 #include <opie/ocontact.h>
 
 #include "ocontactaccessbackend.h"
@@ -49,26 +52,27 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
 	bool remove ( int uid );
 	bool replace ( const OContact& contact );
 	
 	OContact find ( int uid ) const;
 	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