1 files changed, 3 insertions, 36 deletions

diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index adc7256..c013f52 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -136,288 +136,255 @@ bool ResourceSharpDTM::doOpen()
     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;
 }
 
 void ResourceSharpDTM::doClose()
 {
   qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1());
 
   if(mAccess)
   {
     delete mAccess;
     mAccess = 0;
   }
   // it seems so, that deletion of access deletes backend as well
   //delete backend;
 
   return;
 }
 
 bool ResourceSharpDTM::load()
 {
   qDebug("ResourceSharpDTM::load: %s", fileName().latin1());
 
   bool res = false;
 
   CardId id;
 
   for (bool res=mAccess->first(); res == true; res=mAccess->next())
   {
     id = mAccess->cardId();
 
     KABC::Addressee addressee;
 
     res = mConverter->sharpToAddressee( id, mAccess, addressee );
 
     if ( !addressee.isEmpty() && res )
     {
       addressee.setResource( this );
       addressBook()->insertAddressee( addressee );
     }
   }
 
   return true;
 }
 
 bool ResourceSharpDTM::save( Ticket *ticket )
 {
   qDebug("ResourceSharpDTM::save: %s", fileName().latin1());
 
   mDirWatch.stopScan();
 
   KABC::AddressBook::Iterator it;
   bool res;
   KABC::Addressee::List changedAddressees;
   typedef QMap<int,QString> 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);
                               //(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
                               //(*it).setExternalUID( QString::number( id ) );
                               //(*it).setOriginalExternalUID( QString::number( id ) ); 
-                              map.insert(id,(*it).uid());
-
-#if 0
-                              KABC::Addressee addressee;
-                              res = mConverter->sharpToAddressee( id, mAccess, addressee );
-                              addressee.setUid((*it).uid() );
-                              (it*).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
-                              res = mAccess->finishEditCard(&id);
-                              //qDebug("2NEW id is %d", id);
-                              addressee.setExternalUID( QString::number( id ) );
-                              addressee.setOriginalExternalUID( QString::number( id ) ); 
-                              changedAddressees.append( addressee );
-#endif
-                              
+                              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 success ");
-              else
+              if ( !res ) 
                   qDebug("delete error ");
 
 
           } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
               //changed
-              qDebug("changed ****");
               res = mAccess->startEditCard(id);
               if (res == true)
                   {
                       res = mConverter->addresseeToSharp( (*it), mAccess, id  );
                       if (res == true)
                           {
                               res = mAccess->finishEditCard(&id);
                               //(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
                               map.insert(id,(*it).uid());
-
-#if 0
-                              KABC::Addressee addressee;
-                              res = mConverter->sharpToAddressee( id, mAccess, addressee );
-                              addressee.setUid((*it).uid() );
-                              addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
-                              changedAddressees.append( addressee );
-                              res = mAccess->finishEditCard(&id);
-#endif
                               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;
-              qDebug("found change %d %s ", idint, itam.data().latin1());
               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 );
                   }
           }
       }
-#if 0
-  KABC::Addressee::List::Iterator it2;
-  for ( it2 = changedAddressees.begin(); it2 != changedAddressees.end(); ++it2 ) {
-      (*it2).computeCsum( "Sharp_DTM" );
-      qDebug("CSUM: %s ",(*it2).getCsum( "Sharp_DTM" ).latin1() );
-      addressBook()->insertAddressee((*it2));
-  }
-#endif
+
   //US  mAccess->save();
 
   mDirWatch.startScan();
   delete ticket;
   unlock( fileName() );
 
   return true;
 }
 
 bool ResourceSharpDTM::lock( const QString &lockfileName )
 {
 #ifdef ALLOW_LOCKING
   qDebug("ResourceSharpDTM::lock: %s", fileName().latin1());
 
   kdDebug(5700) << "ResourceSharpDTM::lock()" << endl;
 
   QString fn = lockfileName;
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName ))
   {
     qDebug("ResourceSharpDTM::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName());
     return false;
   }
 
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 #else
   return true;
 #endif 
 }
 
 void ResourceSharpDTM::unlock( const QString &fileName )
 {
 #ifdef ALLOW_LOCKING
   qDebug("ResourceSharpDTM::unlock() %s", fileName.latin1());
 
   QString fn = fileName;
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 #endif 
 }
 
 void ResourceSharpDTM::setFileName( const QString &newFileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( fileName() );
 
   Resource::setFileName( newFileName );
 
   mDirWatch.addFile( fileName() );
   mDirWatch.startScan();
 
 }
 
 void ResourceSharpDTM::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;