1 files changed, 135 insertions, 13 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index d037d2f..ad0f702 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -320,59 +320,58 @@ void AddressBook::init(const QString &config, const QString &family )
 
   //US added this field to become compatible with Opie/qtopia addressbook
   // values can be "female" or "male" or "". An empty field represents undefined.
   addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                 "X-Gender", "KADDRESSBOOK" );
   addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                 "X-Children", "KADDRESSBOOK" );
   addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                 "X-FreeBusyUrl", "KADDRESSBOOK" );
   addCustomField( i18n( "ExternalID" ), KABC::Field::Personal,
                                 "X-ExternalID", "KADDRESSBOOK" );
 }
 
 AddressBook::~AddressBook()
 {
   delete d->mConfig; d->mConfig = 0;
   delete d->mManager; d->mManager = 0;
 //US  delete d->mErrorHandler; d->mErrorHandler = 0;
   delete d; d = 0;
 }
 
 bool AddressBook::load()
 {
 
-
   clear();
-
   KRES::Manager<Resource>::ActiveIterator it;
   bool ok = true;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     if ( !(*it)->load() ) {
-      error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
+      qDebug( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
       ok = false;
+    } else {
+      qDebug( i18n("Resource loaded: '%1'").arg( (*it)->resourceName() ) );
     }
-
   // mark all addressees as unchanged
   Addressee::List::Iterator addrIt;
   for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt ) {
     (*addrIt).setChanged( false );
     QString id = (*addrIt).custom( "KADDRESSBOOK", "X-ExternalID" );
     if ( !id.isEmpty() ) {
         //qDebug("setId aa %s ", id.latin1());
         (*addrIt).setIDStr(id );
     }
   }
   blockLSEchange = true;
   return ok;
 }
 
 bool AddressBook::save( Ticket *ticket )
 {
   kdDebug(5700) << "AddressBook::save()"<< endl;
 
   if ( ticket->resource() ) {
     deleteRemovedAddressees();
     return ticket->resource()->save( ticket );
   }
 
   return false;
@@ -383,69 +382,141 @@ void  AddressBook::export2File( QString fileName )
   QFile outFile( fileName );
   if ( !outFile.open( IO_WriteOnly ) ) {
     QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
     KMessageBox::error( 0, text.arg( fileName ) );
     return ;
   }
   QTextStream t( &outFile );
   t.setEncoding( QTextStream::UnicodeUTF8 );
   Iterator it;
   KABC::VCardConverter::Version version;
   version = KABC::VCardConverter::v3_0;
   for ( it = begin(); it != end(); ++it ) {
       if ( !(*it).IDStr().isEmpty() ) {
           (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() );
       }
     KABC::VCardConverter converter;
     QString vcard; 
     //Resource *resource() const;
     converter.addresseeToVCard( *it, vcard, version );
     t << vcard << "\r\n";
   }
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
+// if QStringList uids is empty, all are exported
+bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
+{
+  KABC::VCardConverter converter;
+  QString datastream;
+  Iterator it; 
+  bool all = uids.isEmpty();
+  for ( it = begin(); it != end(); ++it ) {
+      // for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
+      if ( ! all ) {
+          if ( ! ( uids.contains((*it).uid() ) ))
+              continue;
+      }
+      KABC::Addressee a = ( *it );
+      if ( a.isEmpty() )
+          continue;
+      a.simplifyEmails();
+      a.simplifyPhoneNumbers();
+      a.simplifyPhoneNumberTypes();
+      a.simplifyAddresses();
+
+      QString vcard;
+      QString vcardnew;
+      converter.addresseeToVCard( a, vcard );
+      int start = 0;
+      int next;
+      while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
+          int semi = vcard.find(";", next);
+          int dopp = vcard.find(":", next);
+          int sep;
+          if ( semi < dopp && semi >= 0 )
+              sep = semi ;
+          else
+              sep = dopp;
+          vcardnew +=vcard.mid( start, next - start);
+          vcardnew +=vcard.mid( next+5,sep -next -5 ).upper();
+          start = sep;
+      }
+      vcardnew += vcard.mid( start,vcard.length() );
+      vcard = "";
+      start = 0;
+      while ( (next = vcardnew.find("ADR", start) )>= 0 ) {
+          int sep = vcardnew.find(":", next);
+          vcard +=vcardnew.mid( start, next - start+3);
+          start = sep;
+      }
+      vcard += vcardnew.mid( start,vcardnew.length() );
+      vcard.replace ( QRegExp(";;;") , "" );
+      vcard.replace ( QRegExp(";;") , "" );
+      datastream += vcard;
+     
+  }
+  
+  QFile outFile(fileName);
+  if ( outFile.open(IO_WriteOnly) ) { 
+      datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
+      QTextStream t( &outFile );  // use a text stream
+      t.setEncoding( QTextStream::UnicodeUTF8 );
+      t <<datastream;
+      t <<  "\r\n\r\n";
+      outFile.close();
+          
+  } else {
+      qDebug("Error open temp file ");
+      return false;
+  }
+  return true;
+
+}
 void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
 {
 
     if ( removeOld )
         setUntagged();
     KABC::Addressee::List list;
     QFile file( fileName );
     file.open( IO_ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
     if ( replaceLabel ) { 
         data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
         data.replace ( QRegExp("LABEL") , "ADR" );
         data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
     } else
         data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
     KABC::VCardTool tool;
     list =  tool.parseVCards( data );
     KABC::Addressee::List::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
+        QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
+        if ( !id.isEmpty() ) 
+            (*it).setIDStr(id );
         (*it).setResource( 0 );
         if ( replaceLabel )
             (*it).removeVoice();
         if ( removeOld )
             (*it).setTagged( true );
         insertAddressee( (*it), false, true );
     }
     if ( removeOld )
         removeUntagged();
 }
 void AddressBook::setUntagged()
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).setTagged( false );
     }
 }
 void AddressBook::removeUntagged()
 {
   Iterator ait;
   bool todelete = false;
   Iterator todel;
   for ( ait = begin(); ait != end(); ++ait ) {
       if ( todelete )
@@ -459,98 +530,149 @@ void AddressBook::removeUntagged()
   if ( todelete )
       removeAddressee( todel );
   deleteRemovedAddressees();
 }
 void AddressBook::smplifyAddressees() 
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).simplifyEmails();
         (*ait).simplifyPhoneNumbers();
         (*ait).simplifyPhoneNumberTypes();
         (*ait).simplifyAddresses();
     }
 }
 void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         QString id = (*ait).IDStr();
         (*ait).setIDStr( ":");
         (*ait).setExternalUID( id );
         (*ait).setOriginalExternalUID( id ); 
         if ( isPreSync )
             (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
-        else
+        else {
             (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
+            (*ait).setID( currentSyncDevice,id );
+            
+        }
+    }
+}
+void AddressBook::findNewExtIds(  QString fileName, QString currentSyncDevice  )
+{
+ 
+    setUntagged();
+    KABC::Addressee::List list;
+    QFile file( fileName );
+    file.open( IO_ReadOnly );
+    QByteArray rawData = file.readAll();
+    file.close();
+    QString data;
+
+    data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
+    KABC::VCardTool tool;
+    list =  tool.parseVCards( data );
+    KABC::Addressee::List::Iterator it;
+    for ( it = list.begin(); it != list.end(); ++it ) {
+        Iterator ait;
+        for ( ait = begin(); ait != end(); ++ait ) {
+            if ( !(*ait).tagged() ) {
+                if ( (*ait).containsAdr(*it)) {
+                    (*ait).setTagged(true);
+                    QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
+                    (*it).setIDStr( ":");
+                    (*it).setID( currentSyncDevice,id );
+                    (*it).setExternalUID( id );
+                    (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
+                    (*it).setUid( ( (*ait).uid() ));
+                    break;
+                }
+            }
+            
+        }
+        if ( ait == end() )
+            qDebug("ERROR:: no ext ID found for uid: %s", (*it).uid().latin1());      
+    }
+    clear();
+    for ( it = list.begin(); it != list.end(); ++it ) {
+        insertAddressee( (*it)  );
     }
 }
+
 bool AddressBook::saveABphone( QString fileName )
 {
-    smplifyAddressees();
+    //smplifyAddressees();
     qDebug("saveABphone:: saving AB... ");
-    if ( ! saveAB() )
+    if ( ! export2PhoneFormat( QStringList() ,fileName ) )
         return false;
     qDebug("saveABphone:: writing to phone... ");   
     if ( !PhoneAccess::writeToPhone( fileName) ) {
         return false;
     }
     qDebug("saveABphone:: re-reading from phone... ");   
     if ( !PhoneAccess::readFromPhone( fileName) ) {
         return false;
     }
-    qDebug("reloading phone book... ");
-    if ( !load() )
-        return false;
     return true;
 }
 bool AddressBook::saveAB()
 {
   bool ok = true;
 
   deleteRemovedAddressees();
   Iterator ait;
   for ( ait = begin(); ait != end(); ++ait ) {
       if ( !(*ait).IDStr().isEmpty() ) {
           (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() );
     }
   }
   KRES::Manager<Resource>::ActiveIterator it;
   KRES::Manager<Resource> *manager = d->mManager;
+  qDebug("SaveAB::saving..." );
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
+      qDebug("SaveAB::checking resource..." );
+      if ( (*it)->readOnly() )
+          qDebug("readonly." );
+      if ( (*it)->isOpen() )
+          qDebug("open" );
+      
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
       Ticket *ticket = requestSaveTicket( *it );
-//        qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
+      qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
       if ( !ticket ) {
-        error( i18n( "Unable to save to resource '%1'. It is locked." )
+        qDebug( i18n( "Unable to save to resource '%1'. It is locked." )
                    .arg( (*it)->resourceName() ) );
         return false;
       }
 
       //if ( !save( ticket ) ) 
       if ( ticket->resource() ) {
           if ( ! ticket->resource()->save( ticket )  )
               ok = false;
+          else
+              qDebug("StdAddressBook::saved '%s'", ticket->resource()->resourceName().latin1() );
+              
       } else 
           ok = false;
           
     }
   }
   return ok;
 }
 
 AddressBook::Iterator AddressBook::begin()
 {
   Iterator it = Iterator();
   it.d->mIt = d->mAddressees.begin();
   return it;
 }
 
 AddressBook::ConstIterator AddressBook::begin() const
 {
   ConstIterator it = ConstIterator();
   it.d->mIt = d->mAddressees.begin();
   return it;
 }
 
 AddressBook::Iterator AddressBook::end()
 {
@@ -572,49 +694,49 @@ void AddressBook::clear()
 }
 
 Ticket *AddressBook::requestSaveTicket( Resource *resource )
 {
   kdDebug(5700) << "AddressBook::requestSaveTicket()" << endl;
 
   if ( !resource )
   {
     qDebug("AddressBook::requestSaveTicket no resource" );
     resource = standardResource();
   }
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
     if ( (*it) == resource ) {
       if ( (*it)->readOnly() || !(*it)->isOpen() )
         return 0;
       else
         return (*it)->requestSaveTicket();
     }
   }
 
   return 0;
 }
-
+//void insertAddressee( const Addressee &, bool setRev = true, bool takeResource = false);
 void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeResource )
 {
     if ( blockLSEchange && setRev && a.uid().left( 19 ) == QString("last-syncAddressee-") ) {
         //qDebug("block insert ");
         return;
     }
     //qDebug("inserting.... %s ",a.uid().latin1() );
     bool found = false;
     Addressee::List::Iterator it;
     for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
         if ( a.uid() == (*it).uid() ) {
        
             bool changed = false;
             Addressee addr = a;
             if ( addr != (*it) )
                 changed = true;
 
             if ( takeResource ) {
                 Resource * res = (*it).resource();
                 (*it) = a;
                 (*it).setResource( res );
             } else {
                 (*it) = a;
                 if ( (*it).resource() == 0 )