| -rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp | 36 | ||||
| -rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_vcard.h | 7 |
2 files changed, 36 insertions, 7 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp index 43e530a..5bb21c7 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp @@ -45,13 +45,15 @@ #undef protected namespace Opie { OPimContactAccessBackend_VCard::OPimContactAccessBackend_VCard ( const QString& , const QString& filename ): m_dirty( false ), - m_file( filename ) + m_file( filename ), + version_major( 1 ), + version_minor( 0 ) { load(); } bool OPimContactAccessBackend_VCard::load () @@ -183,28 +185,36 @@ bool OPimContactAccessBackend_VCard::wasChangedExternally() } // *** Private stuff *** OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj ) { OPimContact c; - VObjectIterator it; initPropIterator( &it, obj ); while( moreIteration( &it ) ) { VObject *o = nextVObject( &it ); QCString name = vObjectName( o ); QString value = QString::fromUtf8( vObjectStringZValue( o ) ); - odebug << "(1)Read: %s" << QString( value ).latin1() << oendl; - if ( name == VCNameProp ) { + odebug << "(1)Read: " << name << " " << QString( value ).latin1() << oendl; + if ( name == VCVersionProp ) { + + odebug << "Version: " << value << oendl; + QStringList version = QStringList::split( ".", value ); + version_major = version[0].toUInt(); + version_minor = version[1].toUInt(); + odebug << "Major: "<< version_major << " Minor: " << version_minor << oendl; + + } + else if ( name == VCNameProp ) { VObjectIterator nit; initPropIterator( &nit, o ); while( moreIteration( &nit ) ) { VObject *o = nextVObject( &nit ); QCString name = vObjectTypeInfo( o ); QString value = QString::fromUtf8( vObjectStringZValue( o ) ); - odebug << "(2)Read: %s" << value.latin1() << oendl; + odebug << "Nametype is: "<< name << " Value: " << value.latin1() << oendl; if ( name == VCNamePrefixesProp ) c.setTitle( value ); else if ( name == VCNameSuffixesProp ) c.setSuffix( value ); else if ( name == VCFamilyNameProp ) c.setLastName( value ); @@ -223,14 +233,15 @@ OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj ) QString country; VObjectIterator nit; initPropIterator( &nit, o ); while( moreIteration( &nit ) ) { VObject *o = nextVObject( &nit ); - QCString name = vObjectName( o ); + QCString name = vObjectTypeInfo( o ); QString value = QString::fromUtf8( vObjectStringZValue( o ) ); + odebug << "AddressType is: "<< name << " Value: " << value.latin1() << oendl; if ( name == VCHomeProp ) work = FALSE; else if ( name == VCWorkProp ) work = TRUE; else if ( name == VCStreetAddressProp ) street = value; @@ -271,12 +282,13 @@ OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj ) VObjectIterator nit; initPropIterator( &nit, o ); while( moreIteration( &nit ) ) { VObject *o = nextVObject( &nit ); QCString name = vObjectTypeInfo( o ); + odebug << "Telephonetype is: "<< name << " Value: " << value.latin1() << oendl; if ( name == VCHomeProp ) type |= HOME; else if ( name == VCWorkProp ) type |= WORK; else if ( name == VCVoiceProp ) type |= VOICE; @@ -285,21 +297,25 @@ OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj ) else if ( name == VCFaxProp ) type |= FAX; else if ( name == VCPagerProp ) type |= PAGER; else if ( name == VCPreferredProp ) ; + else if ( name.left( 2 ) == "X-" || name.left( 2 ) == "x-" ) + ; // Ignore else type |= UNKNOWN; } if ( (type & UNKNOWN) != UNKNOWN ) { if ( ( type & (HOME|WORK) ) == 0 ) // default type |= HOME; if ( ( type & (VOICE|CELL|FAX|PAGER) ) == 0 ) // default type |= VOICE; + odebug << "value %s %d" << value.data() << type << oendl; + if ( (type & (VOICE|HOME) ) == (VOICE|HOME) && (type & (CELL|HOME) ) != (CELL|HOME) ) c.setHomePhone( value ); if ( ( type & (FAX|HOME) ) == (FAX|HOME) ) c.setHomeFax( value ); if ( ( type & (CELL|HOME) ) == (CELL|HOME) ) c.setHomeMobile( value ); @@ -318,17 +334,21 @@ OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj ) bool valid = TRUE; VObjectIterator nit; initPropIterator( &nit, o ); while( moreIteration( &nit ) ) { VObject *o = nextVObject( &nit ); QCString name = vObjectTypeInfo( o ); + odebug << "Emailtype is: "<< name << " Value: " << value.latin1() << oendl; if ( name != VCInternetProp && name != VCHomeProp && name != VCWorkProp && - name != VCPreferredProp ) + name != VCPreferredProp && + name.left( 2 ) != "X-" && name.left( 2 ) != "x-" ){ // ### preffered should map to default email valid = FALSE; + odebug << "Email was detected as invalid!" << oendl; + } } if ( valid ) { c.insertEmail( email ); } } else if ( name == VCURLProp ) { @@ -579,7 +599,9 @@ VObject* OPimContactAccessBackend_VCard::safeAddProp( VObject *o, const char *pr VObject *ret = 0; if ( o ) ret = addProp( o, prop ); return ret; } + + } diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h index 1faf747..b734530 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h @@ -72,11 +72,18 @@ private: 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, OPimContact> m_map; + + /** + * Version of parsed VCard + */ + uint version_major; + uint version_minor; + }; } #endif |