sync fixes

2 files changed, 27 insertions, 20 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 6194d6d..4c4ae09 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -559,13 +559,12 @@ void AddressBook::removeSyncInfo( QString syncProfile)
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).removeID( syncProfile );
     } 
     if ( syncProfile.isEmpty() ) {
         Iterator it = begin();
         Iterator it2 ;
-        QDateTime dt ( QDate( 2004,1,1) );
         while ( it != end() ) {
             if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 it2 = it;
                 //qDebug("removing %s ",(*it).uid().latin1() );
                 ++it;
                 removeAddressee( it2 );
@@ -783,18 +782,13 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeRes
                 (*it) = a;
                 if ( (*it).resource() == 0 )
                     (*it).setResource( standardResource() );
             }
             if ( changed ) {
                 if ( setRev ) {
-              
-                    // get rid of micro seconds
-                    QDateTime dt =  QDateTime::currentDateTime();
-                    QTime t =  dt.time();
-                    dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
-                    (*it).setRevision( dt ); 
+                    (*it).setRevision( QDateTime::currentDateTime() ); 
                 }
                 (*it).setChanged( true );
             }
 
             found = true;
         } else {
@@ -813,17 +807,17 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeRes
                 }
             }
         }
     }
     if ( found )
         return;
+    
     d->mAddressees.append( a );
     Addressee& addr = d->mAddressees.last();
     if ( addr.resource() == 0 )
         addr.setResource( standardResource() );
-
     addr.setChanged( true );
 }
 
 void AddressBook::removeAddressee( const Addressee &a )
 {
   Iterator it;
@@ -856,33 +850,31 @@ void AddressBook::removeAddressee( const Addressee &a )
 }
 
 void AddressBook::removeSyncAddressees( bool removeDeleted )
 {
     Iterator it = begin();
     Iterator it2 ;
-    QDateTime dt ( QDate( 2004,1,1) );
+    QDateTime dt ( QDate( 2003,1,1) );
     while ( it != end() ) {
         (*it).setRevision( dt );
         if (( *it).IDStr() != "changed" ) { 
             // "changed" is used for tagging changed addressees when syncing with KDE or OL
             (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
-            (*it).setIDStr("");
+            (*it).setIDStr(":");
         }
         if ( ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE && removeDeleted  )|| (*it).uid().left( 19 ) == QString("last-syncAddressee-")) {
             it2 = it;
             //qDebug("removing %s ",(*it).uid().latin1() );
             ++it;
             removeAddressee( it2 );
         } else  {
             //qDebug("skipping %s ",(*it).uid().latin1() );
             if ( removeDeleted ) {
                 // we have no postprocessing in the resource, we have to do it here
                 // we have to compute csum for all, because it could be the first sync
                 (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
-              
-
             }
             ++it;
         }
     }
     deleteRemovedAddressees();
 }
@@ -928,26 +920,28 @@ void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool
 {
     //qDebug("AddressBook::postExternSync ");
     AddressBook::Iterator it;  
     for ( it = begin(); it != end(); ++it ) {
         //qDebug("check uid %s ", (*it).uid().latin1() );
         if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
-             (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) {
+             (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ||
+             (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL) {
             Addressee ad = aBook->findByUid( ( (*it).uid() ));
             if ( ad.isEmpty() ) {
                 qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1());
             } else {
                 (*it).setIDStr(":");
-                (*it).computeCsum( csd );
                 if ( setID ) {
                     if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
                         ad.setID( csd, (*it).externalUID() );
                 } else
                     ad.setID( csd, (*it).uid() );
+                (*it).computeCsum( csd );
                 ad.setCsum( csd, (*it).getCsum( csd ) );
-                aBook->insertAddressee( ad );
+                //qDebug("CSUM %s ",(*it).getCsum( csd ).latin1() );
+                aBook->insertAddressee( ad , false);
             }
         }
     }
 }
 
 bool   AddressBook::containsExternalUid( const QString& uid  )
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index d5a110a..3d4992c 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -206,17 +206,17 @@ ulong  Addressee::getCsum4List( const QStringList &  attList)
     return cSum;
 
 }
 void Addressee::computeCsum(const QString &dev)
 {
     QStringList l;
-    if ( !mData->name.isEmpty() ) l.append(mData->name);
-    if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName  );
+    //if ( !mData->name.isEmpty() ) l.append(mData->name);
+    //if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName  );
     if ( !mData->familyName.isEmpty()  ) l.append( mData->familyName );
     if ( !mData->givenName.isEmpty() ) l.append(mData->givenName  );
-    if ( !mData->additionalName  ) l.append( mData->additionalName );
+    if ( !mData->additionalName.isEmpty()  ) l.append( mData->additionalName );
     if ( !mData->prefix.isEmpty()  ) l.append( mData->prefix );
     if ( !mData->suffix.isEmpty()  ) l.append( mData->suffix );
     if ( !mData->nickName.isEmpty()  ) l.append( mData->nickName );
     if ( mData->birthday.isValid()  ) l.append( mData->birthday.toString() );
     if ( !mData->mailer.isEmpty() ) l.append( mData->mailer );
     if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() );
@@ -253,23 +253,33 @@ void Addressee::computeCsum(const QString &dev)
     t.sort();
     for ( iii = 0; iii < t.count(); ++iii)
         l.append( t[iii]  );
     t = mData->custom;
     t.sort();
     for ( iii = 0; iii < t.count(); ++iii)
+        if ( t[iii].left( 25 ) != "KADDRESSBOOK-X-ExternalID" ) {
+            int find = t[iii].find (':')+1;
+            //qDebug("lennnn %d %d  ", find, t[iii].length());
+            if ( find < t[iii].length())
         l.append( t[iii]  );
+
+        }
     KABC::Address::List::Iterator addressIter;
     for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
           ++addressIter ) {
         t = (*addressIter).asList();
         t.sort();
         for ( iii = 0; iii < t.count(); ++iii)
             l.append( t[iii]  );
     }
     uint cs = getCsum4List(l);
-    //qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
+#if 1
+    for ( iii = 0; iii < l.count(); ++iii)
+        qDebug("%d***%s***",iii,l[iii].latin1());
+    qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
+#endif
     setCsum( dev, QString::number (cs ));
 }
 
 void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
 {
 
@@ -1108,13 +1118,16 @@ QString Addressee::productIdLabel()
 
 void Addressee::setRevision( const QDateTime &revision )
 {
   if ( revision == mData->revision ) return;
   detach();
   mData->empty = false;
-  mData->revision = revision;
+  mData->revision = QDateTime( revision.date(),
+                               QTime (revision.time().hour(),
+                                      revision.time().minute(),
+                                      revision.time().second()));
 }
 
 QDateTime Addressee::revision() const
 {
   return mData->revision;
 }