1 files changed, 110 insertions, 114 deletions

diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index aaee801..1222242 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -50,6 +50,7 @@ $Id$
 
 #include "resourceopieconfig.h"
 #include "stdaddressbook.h"
+#include "syncwidget.h"
 
 #include "opieconverter.h"
 
@@ -60,12 +61,12 @@ extern "C"
 {
   void *init_microkabc_opie()
   {
-    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>();
+    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, KRES::SyncWidget>();
   }
 }
 
-ResourceOpie::ResourceOpie( const KConfig *config )
-  : Resource( config ), mConverter (0)
+ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
+  : Resource( config, syncable ), mAccess(0), mConverter (0)
 {
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
 
@@ -80,8 +81,8 @@ ResourceOpie::ResourceOpie( const KConfig *config )
   init( fileName );
 }
 
-ResourceOpie::ResourceOpie( const QString &fileName )
-  : Resource( 0 )
+ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
+  : Resource( 0, syncable )
 {
 //  qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
   init( fileName );
@@ -103,27 +104,30 @@ ResourceOpie::~ResourceOpie()
 {
   if (mConverter != 0)
     delete mConverter;
+
+  if(mAccess != 0)
+    delete mAccess;
+
 }
 
 void ResourceOpie::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 
-  config->writeEntry( "FileName", mFileName );
-  
-//    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  
+  config->writeEntry( "FileName", fileName() );
 }
 
 Ticket *ResourceOpie::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
 
+  qDebug("ResourceOpie::requestSaveTicket: %s", fileName().latin1());
+
   if ( !addressBook() ) return 0;
 
-  if ( !lock( mFileName ) ) {
+  if ( !lock( fileName() ) ) {
     kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '"
-                  << mFileName << "'" << endl;
+                  << fileName() << "'" << endl;
     return 0;
   }
   return createTicket( this );
@@ -132,78 +136,62 @@ Ticket *ResourceOpie::requestSaveTicket()
 
 bool ResourceOpie::doOpen()
 {
-//  qDebug("ResourceOpie::doOpen() %s", mFileName.latin1());
-/*US  
-  QFile file( mFileName );
-
-  if ( !file.exists() ) {
-    // try to create the file
-    bool ok = file.open( IO_WriteOnly );
-    if ( ok )
-      file.close();
+  qDebug("ResourceOpie::doOpen: %s", fileName().latin1());
 
-    return ok;
-  } else {
-    if ( !file.open( IO_ReadWrite ) )
-      return false;
+  OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", fileName() );
+  mAccess = new OContactAccess("KDEPim/Pi", 0l, backend, false);
 
-    if ( file.size() == 0 ) {
-      file.close();
-      return true;
+  if ( !mAccess ) {
+    qDebug("Unable to load file() %s", fileName().latin1());
+    return false;
     }
 
-//US    bool ok = mFormat->checkFormat( &file );
-    bool ok = true;
+  mAccess->setReadAhead( 32 ); // Use ReadAhead-Cache if available
     
-    file.close();
 
-    return ok;
+  if (mConverter == 0)
+  {
+    mConverter = new OpieConverter();
+    bool res = mConverter->init();
+    if ( !res )
+    {
+      qDebug("Unable to initialize opie converter. Most likely a problem with the category file");
+      delete mAccess;
+      mAccess = 0;
+      return false;
   }
-*/
-  qDebug("ResourceOpie::doOpen() has to be fixed - %s", mFileName.latin1());
+  }
+
+
+
   return true;  
 }
 
 void ResourceOpie::doClose()
 {
-//  qDebug("ResourceOpie::doClose() %s", mFileName.latin1());
-}
+  qDebug("ResourceOpie::doClose: %s", fileName().latin1());
 
-bool ResourceOpie::load()
+  if(mAccess)
 {
-//  qDebug("ResourceOpie::load() %s", mFileName.latin1());
-  kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl;
-
-  qDebug("ResourceOpie::load: Try to load file() %s", mFileName.latin1());
+    delete mAccess;
+    mAccess = 0;
+  }
+  // it seems so, that deletion of access deletes backend as well
+  //delete backend;
     
-  OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", mFileName );
-  OContactAccess* access = new OContactAccess("KDEPim/Pi", 0l, backend, false);
+  return;
         
-  if ( !access ) {
-    qDebug("Unable to load file() %s", mFileName.latin1());
-    addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
-    return false;
   }
   
-  access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
 
-  bool res = false;
-  if (mConverter == 0)
-  {
-    mConverter = new OpieConverter();
-    res = mConverter->init();
-    if ( !res )
+bool ResourceOpie::load()
     {
-      qDebug("Unable to initialize opie converter. Most likely a problem with the category file");
-      addressBook()->error( i18n( "Unable to initialize opie converter. Most likely a problem with the category file" ) );
-      delete access;
-      return false;
-    }
-  }
+  qDebug("ResourceOpie::load: %s", fileName().latin1());
 
+  bool res = false;
 
         OContactAccess::List::Iterator it;
-  OContactAccess::List allList = access->allRecords();
+  OContactAccess::List allList = mAccess->allRecords();
   for ( it = allList.begin(); it != allList.end(); ++it )
   {
     const OContact c = (*it);
@@ -218,75 +206,56 @@ bool ResourceOpie::load()
       addressBook()->insertAddressee( addressee );
     }
     
-//    qDebug("found %s", c.fullName().latin1());
   }
   
-  delete access;
-  // it seems so, that deletion of access deletes backend as well
-  //delete backend;
   
   return true;
 }
 
 bool ResourceOpie::save( Ticket *ticket )
 {
-  qDebug("ResourceOpie::save() has to be fixed - %s", mFileName.latin1());
-/*US  
+  qDebug("ResourceOpie::save: %s", fileName().latin1());
   
-  qDebug("ResourceOpie::save %s", mFileName.latin1());
-  kdDebug(5700) << "ResourceOpie::save()" << endl;
 
-  // create backup file
-  QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
-*/   
-/*US we use a simpler method to create a backupfile
     
-  (void) KSaveFile::backupFile( mFileName, QString::null
-  ,extension );
+  KABC::AddressBook::Iterator it;
+  bool res;
+
+  for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
+    OContact c;
+    KABC::Addressee addressee = (*it);
 
-  KSaveFile saveFile( mFileName );
-  bool ok = false;
-  if ( saveFile.status() == 0 && saveFile.file() )
+    res = mConverter->addresseeToOpie( *it, c );
+    if (res == true)
   {
-    mFormat->saveAll( addressBook(), this, saveFile.file() );
-    ok = saveFile.close();
+      res = mAccess->add(c);
+      if (res == false)
+        qDebug("Unable to append Contact %s", c.fullName().latin1());
   }
-*/
-/*US
-//US ToDo: write backupfile  
-  QFile info;
-  info.setName( mFileName );
-  bool ok = info.open( IO_WriteOnly );
-  if ( ok ) {
-//US    mFormat->saveAll( addressBook(), this, &info );
-    
-    info.close();
-    ok = true;
+    else
+    {
+      qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
   }
-  else {
-  
   }
   
-  if ( !ok )
-    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
+  mAccess->save();
   
   delete ticket;
-  unlock( mFileName );
-  
-  return ok;
+  unlock( fileName() );
 
-  qDebug("ResourceOpie::save has to be changed");
-*/  
   return true;
   
 }
 
-bool ResourceOpie::lock( const QString &fileName )
+bool ResourceOpie::lock( const QString &lockfileName )
 {
+  qDebug("ResourceOpie::lock: %s", fileName().latin1());
+
+
 //  qDebug("ResourceOpie::lock() %s", fileName.latin1());
   kdDebug(5700) << "ResourceOpie::lock()" << endl;
 
-  QString fn = fileName;
+  QString fn = lockfileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
@@ -330,7 +299,7 @@ bool ResourceOpie::lock( const QString &fileName )
 
 void ResourceOpie::unlock( const QString &fileName )
 {
-//  qDebug("ResourceOpie::unlock() %s", fileName.latin1());
+  qDebug("ResourceOpie::unlock() %s", fileName.latin1());
   
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
@@ -345,24 +314,18 @@ void ResourceOpie::unlock( const QString &fileName )
   addressBook()->emitAddressBookUnlocked();
 }
 
-void ResourceOpie::setFileName( const QString &fileName )
+void ResourceOpie::setFileName( const QString &newFileName )
 {
   mDirWatch.stopScan();
-  mDirWatch.removeFile( mFileName );
+  mDirWatch.removeFile( fileName() );
   
-  mFileName = fileName;
+  Resource::setFileName( newFileName );
   
-  mDirWatch.addFile( mFileName );
+  mDirWatch.addFile( fileName() );
   mDirWatch.startScan();
 
-//US simulate KDirWatch event  
-//US  fileChanged();
 }
 
-QString ResourceOpie::fileName() const
-{
-  return mFileName;
-}
 
 void ResourceOpie::fileChanged()
 {
@@ -371,7 +334,7 @@ void ResourceOpie::fileChanged()
   if (!addressBook())
     return;
   
-  QString text( i18n( "Opie resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+  QString text( i18n( "Opie resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
@@ -389,7 +352,40 @@ void ResourceOpie::cleanUp()
 {
 //  qDebug("ResourceOpie::cleanup() %s", mFileName.latin1());
 
-  unlock( mFileName );
+  unlock( fileName() );
 }
 
+
+/**
+ * This method returns the number of elements that are currently in the resource.
+ */
+int ResourceOpie::count() const
+{
+  qDebug("ResourceOpie::count: %x", mAccess);
+
+  if (mAccess != 0)
+  {
+    OContactAccess::List contactList = mAccess->allRecords();
+    return contactList.count();
+  }
+  else
+    return 0;
+}
+
+
+/**
+ * This method removes all elements from the resource!! (Not from the addressbook)
+ */
+bool ResourceOpie::clear()
+{
+  if (mAccess != 0) {
+    mAccess->clear();
+    return true;
+  }
+  else
+        return false;
+}
+
+
+
 //US #include "resourceopie.moc"