-rw-r--r-- | kabc/addressbook.cpp | 31 | ||||
-rw-r--r-- | kabc/addressee.cpp | 19 | ||||
-rw-r--r-- | kabc/addressee.h | 1 | ||||
-rw-r--r-- | kabc/stdaddressbook.cpp | 7 |
4 files changed, 43 insertions, 15 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index ec9f893..46a9cf4 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -344,7 +344,12 @@ bool AddressBook::load() // 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; @@ -367,5 +372,10 @@ bool AddressBook::saveAB() 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; @@ -451,6 +461,8 @@ 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; @@ -481,5 +493,5 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev ) 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; @@ -517,5 +529,5 @@ void AddressBook::removeAddressee( const Addressee &a ) 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; @@ -546,11 +558,16 @@ void AddressBook::removeDeletedAddressees() 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(); } diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 0f5d605..d6b70c4 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp @@ -80,5 +80,5 @@ struct Addressee::AddresseeData : public KShared QStringList categories; QStringList custom; - + int mTempSyncStat; Resource *resource; @@ -95,5 +95,5 @@ Addressee::Addressee() mData->mExternalId = ":"; mData->revision = QDateTime ( QDate( 2004,1,1)); - mTempSyncStat = SYNC_TEMPSTATE_INITIAL; + mData->mTempSyncStat = SYNC_TEMPSTATE_INITIAL; } @@ -105,5 +105,4 @@ Addressee::Addressee( const Addressee &a ) { mData = a.mData; - mTempSyncStat = SYNC_TEMPSTATE_INITIAL; } @@ -269,5 +268,7 @@ void Addressee::computeCsum(const QString &dev) l.append( t[iii] ); } - setCsum( dev, QString::number (getCsum4List(l)) ); + uint cs = getCsum4List(l); + qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() ); + setCsum( dev, QString::number (cs )); } void Addressee::removeID(const QString &prof) @@ -280,13 +281,17 @@ void Addressee::setID( const QString & prof , const QString & id ) { detach(); + qDebug("setID1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id ); + qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); } void Addressee::setTempSyncStat( int id ) { - mTempSyncStat = id; + if ( mData->mTempSyncStat == id ) return; + detach(); + mData->mTempSyncStat = id; } int Addressee::tempSyncStat() const { - return mTempSyncStat; + return mData->mTempSyncStat; } @@ -299,5 +304,7 @@ void Addressee::setCsum( const QString & prof , const QString & id ) { detach(); + qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id ); + qDebug("setcsum2 %s ",mData->mExternalId.latin1() ); } diff --git a/kabc/addressee.h b/kabc/addressee.h index 0805458..bfb0840 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h @@ -827,5 +827,4 @@ class Addressee Addressee copy(); void detach(); - int mTempSyncStat; struct AddresseeData; diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index ec47a4e..181a09e 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp @@ -166,5 +166,10 @@ bool StdAddressBook::save() ab->deleteRemovedAddressees(); - + Iterator ait; + for ( ait = ab->begin(); ait != ab->end(); ++ait ) { + if ( !(*ait).IDStr().isEmpty() ) { + (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); + } + } KRES::Manager<Resource>::ActiveIterator it; KRES::Manager<Resource> *manager = ab->resourceManager(); |