more DTM sync

3 files changed, 100 insertions, 3 deletions

diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 867bc07..bba5f9a 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -45,6 +45,7 @@ $Id$
 
 #include <sl/slzdb.h>
 
+#include <libkdepim/ksyncprofile.h>
 
 #include "resourcesharpdtmconfig.h"
 #include "resourcesharpdtm.h"
@@ -202,8 +203,95 @@ bool ResourceSharpDTM::save( Ticket *ticket )
 
   KABC::AddressBook::Iterator it;
   bool res;
+  KABC::Addressee::List changedAddressees;
 
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
+
+      if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+          QString uid = (*it).originalExternalUID();
+          CardId id ;
+          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)
+                          {
+                              KABC::Addressee addressee;
+                              qDebug("1NEW id is %d", id);
+                              res = mConverter->sharpToAddressee( id, mAccess, addressee );
+                              addressee.setUid((*it).uid() );
+                              addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
+                              changedAddressees.append( addressee );
+                              res = mAccess->finishEditCard(&id);
+                              qDebug("2NEW id is %d", id);
+                              
+                              if (res == false)
+                                  qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
+                              else {
+                                  qDebug("added card success ");
+                              }
+                          }
+                      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
+                  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)
+                          {
+                              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);
+                              if (res == false)
+                                  qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
+                              else {
+                                  qDebug("change card succes ");
+                              }
+                          }
+                      else
+                          {
+                              qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1());
+                              mAccess->cancelEditCard();
+                          }
+                  }
+          }
+
+
+
+
+
+
+
+
+      }
+
+#if 0 
+      // old code
     CardId id = 0;	// 0 means new card
     KABC::Addressee addressee = (*it);
 
@@ -227,10 +315,13 @@ bool ResourceSharpDTM::save( Ticket *ticket )
     {
       qDebug("Unable to add new card. Addressee: %s", addressee.formattedName().latin1());
     }
+#endif
 
   }
-
-//US  mAccess->save();
+  KABC::Addressee::List::Iterator it2;
+  for ( it2 = changedAddressees.begin(); it2 != changedAddressees.end(); ++it2 )
+      addressBook()->insertAddressee((*it2));
+  //US  mAccess->save();
 
   mDirWatch.startScan();
   delete ticket;
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index f335729..b80a1da 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -2,7 +2,7 @@ TEMPLATE	= lib
 CONFIG += qt warn_on
 TARGET = microkabc_sharpdtm
 
-INCLUDEPATH += $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include 
+INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include 
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 8f8334e..b065bf3 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -69,6 +69,12 @@ void SharpDTMConverter::deinit()
 bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr )
 {
 	SlZDataBase* db = (SlZDataBase*)database;
+
+    // for syncing: we need setting of the two fields
+    addr.setExternalUID( QString::number( contact ) );
+    addr.setOriginalExternalUID( QString::number( contact ) ); 
+
+
     // name
     qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!");
     addr.setFormattedName(db->readField(ZdbAdrs::FileAs));