more AB sync

1 files changed, 24 insertions, 7 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index ec9f893..46a9cf4 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -334,48 +334,58 @@ bool AddressBook::load()
   clear();
 
   KRES::Manager<Resource>::ActiveIterator it;
   bool ok = true;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     if ( !(*it)->load() ) {
       error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
       ok = false;
     }
 
   // mark all addressees as unchanged
   Addressee::List::Iterator addrIt;
-  for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt )
+  for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt ) {
     (*addrIt).setChanged( false );
-
+    QString id = (*addrIt).custom( "KADDRESSBOOK", "X-ExternalID" );
+    if ( !id.isEmpty() ) {
+        //qDebug("setId aa %s ", id.latin1());
+        (*addrIt).setIDStr(id );
+    }
+  }
   blockLSEchange = true;
   return ok;
 }
 
 bool AddressBook::save( Ticket *ticket )
 {
   kdDebug(5700) << "AddressBook::save()"<< endl;
 
   if ( ticket->resource() ) {
     deleteRemovedAddressees();
     return ticket->resource()->save( ticket );
   }
 
   return false;
 }
 bool AddressBook::saveAB()
 {
   bool ok = true;
 
   deleteRemovedAddressees();
-
+  Iterator ait;
+  for ( ait = begin(); ait != end(); ++ait ) {
+      if ( !(*ait).IDStr().isEmpty() ) {
+          (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() );
+    }
+  }
   KRES::Manager<Resource>::ActiveIterator it;
   KRES::Manager<Resource> *manager = d->mManager;
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
       Ticket *ticket = requestSaveTicket( *it );
 //        qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
       if ( !ticket ) {
         error( i18n( "Unable to save to resource '%1'. It is locked." )
                    .arg( (*it)->resourceName() ) );
         return false;
       }
 
@@ -441,26 +451,28 @@ Ticket *AddressBook::requestSaveTicket( Resource *resource )
         return 0;
       else
         return (*it)->requestSaveTicket();
     }
   }
 
   return 0;
 }
 
 void AddressBook::insertAddressee( const Addressee &a, bool setRev )
 {
     if ( blockLSEchange && setRev && a.uid().left( 19 ) == QString("last-syncAddressee-") ) {
+        //qDebug("block insert ");
         return;
     }
+    //qDebug("inserting.... %s ",a.uid().latin1() );
     bool found = false;
     Addressee::List::Iterator it;
     for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
         if ( a.uid() == (*it).uid() ) {
        
             bool changed = false;
             Addressee addr = a;
             if ( addr != (*it) )
                 changed = true;
 
             (*it) = a;
             if ( (*it).resource() == 0 )
@@ -471,25 +483,25 @@ void AddressBook::insertAddressee( const Addressee &a, bool 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).setChanged( true );
             }
 
             found = true;
         } else {
-            if ( (*it).uid() == QString("last-syncAddressee-") ) {
+            if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 QString name = (*it).uid().mid( 19 );
                 Addressee b = a;
                 QString id = b.getID( name );
                 if (  ! id.isEmpty() ) {
                     QString des = (*it).note();
                     int startN;
                     if( (startN = des.find( id ) ) >= 0 ) {
                         int endN = des.find( ",", startN+1 );
                         des =  des.left( startN ) + des.mid( endN+1 );
                         (*it).setNote( des );
                     }
                 }
@@ -507,25 +519,25 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
 }
 
 void AddressBook::removeAddressee( const Addressee &a )
 {
   Iterator it;
   Iterator it2;
   bool found = false;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
         found = true;
         it2 = it;
     } else {
-        if ( (*it).uid() == QString("last-syncAddressee-") ) {
+        if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
             QString name = (*it).uid().mid( 19 );
             Addressee b = a;
             QString id = b.getID( name );
             if ( ! id.isEmpty() ) {
                 QString des = (*it).note();
                 if( des.find( id ) < 0 ) {
                     des +=   id  + ",";
                     (*it).setNote( des );
                 }
             }
         }
         
@@ -536,30 +548,35 @@ void AddressBook::removeAddressee( const Addressee &a )
       removeAddressee( it2 );
       
 }
 
 void AddressBook::removeDeletedAddressees()
 {
     deleteRemovedAddressees();
     Iterator it = begin();
     Iterator it2 ;
     QDateTime dt ( QDate( 2004,1,1) );
     while ( it != end() ) {
         (*it).setRevision( dt );
-        if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
+        (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
+        (*it).setIDStr("");
+        if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE || (*it).uid().left( 19 ) == QString("last-syncAddressee-")) {
             it2 = it;
+            //qDebug("removing %s ",(*it).uid().latin1() );
             ++it;
             removeAddressee( it2 );
-        } else
+        } else {
+            //qDebug("skipping %s ",(*it).uid().latin1() );
             ++it;
+        }
     }
     deleteRemovedAddressees();
 }
 
 void AddressBook::removeAddressee( const Iterator &it )
 {
   d->mRemovedAddressees.append( (*it) );
   d->mAddressees.remove( it.d->mIt );
 }
 
 AddressBook::Iterator AddressBook::find( const Addressee &a )
 {