From a7e2fe5bb10af47a239b8b014a210568cc79287a Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 29 Oct 2004 19:40:20 +0000 Subject: fixed dtm resource --- (limited to 'kabc/plugins/sharpdtm') diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp index 48b7d91..7069f5d 100644 --- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp +++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp @@ -81,7 +81,17 @@ ResourceSharpDTM::ResourceSharpDTM( const QString &fileName ) void ResourceSharpDTM::init( const QString &fileName ) { - setFileName( fileName ); + if (mConverter == 0) { + mConverter = new SharpDTMConverter(); + bool res = mConverter->init(); + if ( !res ) + { + QString msg("Unable to initialize sharp converter. Most likely a problem with the category file"); + qDebug(msg); + return; + } + } + setFileName( fileName ); } ResourceSharpDTM::~ResourceSharpDTM() @@ -109,31 +119,9 @@ Ticket *ResourceSharpDTM::requestSaveTicket() bool ResourceSharpDTM::doOpen() -{ - qDebug("%xResourceSharpDTM::doOpen: %s", this,fileName().latin1()); - - if ( ! mAccess ) { - // the last parameter in the SlZDataBase constructor means "readonly" - mAccess = new SlZDataBase(fileName(), - SlZDataBase::addressbookItems(), - NULL, false); - } - if ( !mAccess ) { - qDebug("Unable to load file() %s", fileName().latin1()); +{ + if (!mConverter) return false; - } - if (mConverter == 0) { - mConverter = new SharpDTMConverter(); - bool res = mConverter->init(); - if ( !res ) - { - QString msg("Unable to initialize sharp converter. Most likely a problem with the category file"); - qDebug(msg); - delete mAccess; - mAccess = 0; - return false; - } - } return true; } @@ -144,6 +132,17 @@ void ResourceSharpDTM::doClose() bool ResourceSharpDTM::load() { + if (!mConverter) + return false; + QString fileN = SlZDataBase::addressbookFileName(); + if ( ! mAccess ) { + mAccess = new SlZDataBase(fileN, + SlZDataBase::addressbookItems(), + 0, false); + } + if(mAccess == 0) + return false; + qDebug("%xResourceSharpDTM::load: %s",this, fileName().latin1()); bool res = false; CardId id; @@ -158,103 +157,120 @@ bool ResourceSharpDTM::load() addressBook()->insertAddressee( addressee ); } } + if(mAccess != 0) + delete mAccess; + mAccess = 0; + return true; } bool ResourceSharpDTM::save( Ticket *ticket ) -{ - qDebug("ResourceSharpDTM::save: %s", fileName().latin1()); - KABC::AddressBook::Iterator it; - bool res; - KABC::Addressee::List changedAddressees; - typedef QMap AddresseeMap; - AddresseeMap map; - CardId id ; - for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { - - if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { - QString uid = (*it).originalExternalUID(); - bool res; - if ( uid.isEmpty() ) - id = 0; - else - id = uid.toUInt(); - KABC::Addressee addressee = (*it); - if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) { - res = mAccess->startEditCard(id); - if (res == true) - { - res = mConverter->addresseeToSharp( (*it), mAccess, id ); - if (res == true) - { - res = mAccess->finishEditCard(&id);; - map.insert(id,(*it).uid()); - if (res == false) - qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); +{ + if (!mConverter) + return false; + QString fileN = SlZDataBase::addressbookFileName(); + if ( ! mAccess ) { + mAccess = new SlZDataBase(fileN, + SlZDataBase::addressbookItems(), + 0, false); + } + if(mAccess == 0) + return false; + qDebug("ResourceSharpDTM::save: %s", fileName().latin1()); + KABC::AddressBook::Iterator it; + bool res; + KABC::Addressee::List changedAddressees; + typedef QMap AddresseeMap; + AddresseeMap map; + CardId id ; + for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { + + if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { + QString uid = (*it).originalExternalUID(); + bool res; + if ( uid.isEmpty() ) + id = 0; + else + id = uid.toUInt(); + KABC::Addressee addressee = (*it); + if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) { + res = mAccess->startEditCard(id); + if (res == true) + { + res = mConverter->addresseeToSharp( (*it), mAccess, id ); + if (res == true) + { + res = mAccess->finishEditCard(&id);; + map.insert(id,(*it).uid()); + if (res == false) + qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); - } - else - { - qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); - mAccess->cancelEditCard(); - } - } - - } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { - res = mAccess->deleteCard(&id); - if ( !res ) - qDebug("delete error "); - - - } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { - //changed - res = mAccess->startEditCard(id); - if (res == true) - { - res = mConverter->addresseeToSharp( (*it), mAccess, id ); - if (res == true) - { - res = mAccess->finishEditCard(&id); - map.insert(id,(*it).uid()); - if (res == false) - qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); - } - else - { - qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); - mAccess->cancelEditCard(); - } - } - } - } + } + else + { + qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); + mAccess->cancelEditCard(); + } + } + + } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { + res = mAccess->deleteCard(&id); + if ( !res ) + qDebug("delete error "); + + + } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { + //changed + res = mAccess->startEditCard(id); + if (res == true) + { + res = mConverter->addresseeToSharp( (*it), mAccess, id ); + if (res == true) + { + res = mAccess->finishEditCard(&id); + map.insert(id,(*it).uid()); + if (res == false) + qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); + } + else + { + qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); + mAccess->cancelEditCard(); + } + } + } + } - } - AddresseeMap::Iterator itam; - for ( res=mAccess->first(); res == true; res=mAccess->next()) - { - id = mAccess->cardId(); - int idint = id; - itam = map.find( idint ); - if ( itam != map.end() ) { - KABC::Addressee addressee; - res = mConverter->sharpToAddressee( id, mAccess, addressee ); - - if ( !addressee.isEmpty() && res ) - { - addressee.setResource( this ); - addressee.setUid( itam.data() ); - addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); - addressBook()->insertAddressee( addressee , false ); - } - } - } - delete ticket; - - return true; + } + AddresseeMap::Iterator itam; + for ( res=mAccess->first(); res == true; res=mAccess->next()) + { + id = mAccess->cardId(); + int idint = id; + itam = map.find( idint ); + if ( itam != map.end() ) { + KABC::Addressee addressee; + res = mConverter->sharpToAddressee( id, mAccess, addressee ); + + if ( !addressee.isEmpty() && res ) + { + addressee.setResource( this ); + addressee.setUid( itam.data() ); + addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); + addressBook()->insertAddressee( addressee , false ); + } + } + } + delete ticket; + if(mAccess != 0) + delete mAccess; + mAccess = 0; + return true; } bool ResourceSharpDTM::lock( const QString &lockfileName ) { + return true; } void ResourceSharpDTM::unlock( const QString &fileName ) @@ -278,7 +294,7 @@ void ResourceSharpDTM::removeAddressee( const Addressee &addr ) void ResourceSharpDTM::cleanUp() { - unlock( fileName() ); + } -- cgit v0.9.0.2