1 files changed, 91 insertions, 5 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7d8586a..ab2824c 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -160,2 +160,3 @@ $Id$
 #include "kaimportoldialog.h"
+#include <libkdepim/ol_access.h>
 #endif
@@ -1371,5 +1372,3 @@ void KABCore::importFromOL()
 #ifdef _OL_IMPORT_
-  KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"),  mAddressBook, this );
-  idgl->exec();
-  KABC::Addressee::List list = idgl->getAddressList();
+    KABC::Addressee::List list = OL_access::instance()->importOLcontacts();
   if ( list.count() > 0 ) {
@@ -1385,4 +1384,7 @@ void KABCore::importFromOL()
     }
+        QString mess =  i18n("%1 contacts read from OL.\n\n%2 contacts added to addressbook!").arg( list.count()).arg( listNew.count() );
     if ( listExisting.count()  > 0 )
-      KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() ));
+            mess += "\n\n"+ i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() );
+
+        KMessageBox::information( this, mess );
     if ( listNew.count() > 0 ) {
@@ -1393,3 +1395,2 @@ void KABCore::importFromOL()
   }
-  delete idgl;
 #endif
@@ -1397,2 +1398,50 @@ void KABCore::importFromOL()
 
+bool KABCore::readOLdata(  KABC::AddressBook* local )
+{
+#ifdef _OL_IMPORT_
+    QStringList folderList = OL_access::instance()->getFolderSelection( OL_CONTACT_DATA , i18n("Select Folder to sync"));
+    KABC::Addressee::List list;
+    if ( folderList.count() ) {
+        OL_access::instance()->readContactData( OL_access::instance()->getFolderFromID( 0, folderList[1] ) , &list, true );
+        KABC::Addressee::List::Iterator it;
+        for ( it = list.begin(); it != list.end(); ++it ) {
+            (*it).setExternalUID( (*it).uid() ); 
+            (*it).setOriginalExternalUID( (*it).uid() ); 
+            (*it).setTempSyncStat(  SYNC_TEMPSTATE_NEW_EXTERNAL );
+            local->insertAddressee( (*it) , false, false );
+        }
+        mOLsyncFolderID = folderList[1];
+        //KMessageBox::information( this,  i18n("OLsync folder ID ") +  mOLsyncFolderID );
+    }
+    return list.count() > 0;
+#else
+    return false;
+#endif
+}
+bool KABCore::writeOLdata(  KABC::AddressBook* aBook )
+{
+#ifdef _OL_IMPORT_
+    if ( !OL_access::instance()->setSelectedFolder( mOLsyncFolderID ) )
+        return false;
+    KABC::AddressBook::Iterator it;
+    for ( it = aBook->begin(); it != aBook->end(); ++it ) {
+        if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+            KABC::Addressee addressee = (*it);
+            if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) {
+                (*it) = OL_access::instance()->addAddressee( (*it) );
+                (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
+            } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
+                OL_access::instance()->deleteAddressee( (*it) );
+            } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+                //changed
+                (*it) = OL_access::instance()->changeAddressee( (*it) );
+                (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
+            }
+        }
+    }
+    return true;
+#else
+    return false;
+#endif
+}
 void KABCore::importVCard( const QString &vCard, bool showPreview )
@@ -3376,2 +3425,37 @@ void  KABCore::removeSyncInfo( QString syncProfile)
 
+bool KABCore::syncOL()
+{
+    disableBR( true );
+    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
+    AddressBook abLocal;
+    if ( ! readOLdata( &abLocal ) )
+        return false;
+    bool syncOK = false;
+    message(i18n("Data from OL loaded..."), false);
+    mGlobalSyncMode = SYNC_MODE_EXTERNAL;
+    message(i18n("Sync preprocessing..."),false);
+    abLocal.preOLSync( mAddressBook ,mCurrentSyncDevice );
+    message(i18n("Synchronizing..."),false);
+    syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
+    syncManager->hideProgressBar();
+    if (  syncOK ) {
+        if ( syncManager->mWriteBackFile ) {
+            abLocal.removeSyncAddressees( false );
+            message(i18n("Saving address data to OL..."),false);
+            //abLocal.saveAB();
+            writeOLdata( &abLocal );
+            message(i18n("Sync postprocessing..."),false);
+            abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
+        }
+    } else
+        message( i18n("Sync cancelled or failed.") );
+    setModified();
+    abLocal.removeResources();
+    if ( syncOK ) {
+        mViewManager->refreshView();
+        message(i18n("OL syncing finished."));
+    }
+    disableBR( false );
+    return syncOK;
+}
 
@@ -3382,2 +3466,4 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
         return syncPhone();
+    if (  resource == "ol" )
+        return syncOL();
     disableBR( true );