sync fixes

author: zautrix <zautrix> 2004-10-29 09:03:54 (UTC)
committer: zautrix <zautrix> 2004-10-29 09:03:54 (UTC)
commit: 6500d6ebb080f1de58fe676aa0a730d47fcf64f5 (patch) (unidiff)
tree: 41841e05bf1e6b88e6e55f42011dce5f6bed85b4 /kabc
parent: 41e3625b8c38ff45e70b59416a519d59a5f4d937 (diff)
download: kdepimpi-6500d6ebb080f1de58fe676aa0a730d47fcf64f5.zip
kdepimpi-6500d6ebb080f1de58fe676aa0a730d47fcf64f5.tar.gz
kdepimpi-6500d6ebb080f1de58fe676aa0a730d47fcf64f5.tar.bz2
2 files changed, 29 insertions, 22 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 6194d6d..4c4ae09 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -437,639 +437,633 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
      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;
 }
 int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
 {
    if ( removeOld )
        setUntagged( true );
    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();
    return list.count();
 }
 void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        if ( setNonSyncTagged ) {
            if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
                (*ait).setTagged( true );
            } else
                (*ait).setTagged( false );
        } else
            (*ait).setTagged( false );
    }
 }
 void AddressBook::removeUntagged()
 {
  Iterator ait;
  bool todelete = false;
  Iterator todel;
  for ( ait = begin(); ait != end(); ++ait ) {
      if ( todelete )
          removeAddressee( todel );
      if (!(*ait).tagged()) {
          todelete = true;
          todel = ait;
      } else
          todelete = false;
  } 
  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::removeSyncInfo( QString syncProfile)
 {
    Iterator ait;
    for ( ait = begin(); ait != end(); ++ait ) {
        (*ait).removeID( syncProfile );
    } 
    if ( syncProfile.isEmpty() ) {
        Iterator it = begin();
        Iterator it2 ;
-        QDateTime dt ( QDate( 2004,1,1) );
        while ( it != end() ) {
            if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                it2 = it;
                //qDebug("removing %s ",(*it).uid().latin1() );
                ++it;
                removeAddressee( it2 );
            } else  {
                //qDebug("skipping %s ",(*it).uid().latin1() );
                ++it;
            }
        }
    } else { 
        Addressee lse;
        lse =  findByUid( "last-syncAddressee-"+ syncProfile );
        if ( ! lse.isEmpty() )
            removeAddressee( lse );  
    }
 }
 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 {
            (*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();
    qDebug("saveABphone:: saving AB... ");
    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;
    }
    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("resource is readonly." );
      if ( (*it)->isOpen() )
          qDebug("resource is open" );
      
    if ( !(*it)->readOnly() && (*it)->isOpen() ) {
      Ticket *ticket = requestSaveTicket( *it );
      qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
      if ( !ticket ) {
        qDebug( i18n( "Unable to save to resource '%1'. It is locked." )
                   .arg( (*it)->resourceName() ) );
        return false;
      }
      //if ( !save( ticket ) ) 
      if ( ticket->resource() ) {
          QString name = ticket->resource()->resourceName();
          if ( ! ticket->resource()->save( ticket )  )
              ok = false;
          else
              qDebug("StdAddressBook::resource saved '%s'", name.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()
 {
  Iterator it = Iterator();
  it.d->mIt = d->mAddressees.end();
  return it;
 }
 AddressBook::ConstIterator AddressBook::end() const
 {
  ConstIterator it = ConstIterator();
  it.d->mIt = d->mAddressees.end();
  return it;
 }
 void AddressBook::clear()
 {
  d->mAddressees.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 )
                    (*it).setResource( standardResource() );
            }
            if ( changed ) {
                if ( setRev ) {
-              
+                    (*it).setRevision( QDateTime::currentDateTime() ); 
-                    // get rid of micro seconds
-                    QDateTime dt =  QDateTime::currentDateTime();
-                    QTime t =  dt.time();
-                    dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
-                    (*it).setRevision( dt ); 
                }
                (*it).setChanged( true );
            }
            found = true;
        } else {
            if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                QString name = (*it).uid().mid( 19 );
                Addressee b = a;
                QString id = b.getID( name );
                if (  ! id.isEmpty() ) {
                    QString des = (*it).note();
                    int startN;
                    if( (startN = des.find( id ) ) >= 0 ) {
                        int endN = des.find( ",", startN+1 );
                        des =  des.left( startN ) + des.mid( endN+1 );
                        (*it).setNote( des );
                    }
                }
            }
        }
    }
    if ( found )
-        return;
+        return; 
+    
    d->mAddressees.append( a );
    Addressee& addr = d->mAddressees.last();
    if ( addr.resource() == 0 )
        addr.setResource( standardResource() );
    addr.setChanged( true );
 }
 void AddressBook::removeAddressee( const Addressee &a )
 {
  Iterator it;
  Iterator it2;
  bool found = false;
  for ( it = begin(); it != end(); ++it ) {
    if ( a.uid() == (*it).uid() ) {
        found = true;
        it2 = it;
    } else {
        if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
            QString name = (*it).uid().mid( 19 );
            Addressee b = a;
            QString id = b.getID( name );
            if ( ! id.isEmpty() ) {
                QString des = (*it).note();
                if( des.find( id ) < 0 ) {
                    des +=   id  + ",";
                    (*it).setNote( des );
                }
            }
        }
        
    }
  }
  if ( found )
      removeAddressee( it2 );
      
 }
 void AddressBook::removeSyncAddressees( bool removeDeleted )
 {
    Iterator it = begin();
    Iterator it2 ;
-    QDateTime dt ( QDate( 2004,1,1) );
+    QDateTime dt ( QDate( 2003,1,1) );
    while ( it != end() ) {
        (*it).setRevision( dt );
        if (( *it).IDStr() != "changed" ) { 
            // "changed" is used for tagging changed addressees when syncing with KDE or OL
            (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
-            (*it).setIDStr("");
+            (*it).setIDStr(":");
        }
        if ( ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE && removeDeleted  )|| (*it).uid().left( 19 ) == QString("last-syncAddressee-")) {
            it2 = it;
            //qDebug("removing %s ",(*it).uid().latin1() );
            ++it;
            removeAddressee( it2 );
        } else  {
            //qDebug("skipping %s ",(*it).uid().latin1() );
            if ( removeDeleted ) {
                // we have no postprocessing in the resource, we have to do it here
                // we have to compute csum for all, because it could be the first sync
                (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
-              
            }
            ++it;
        }
    }
    deleteRemovedAddressees();
 }
 void AddressBook::removeAddressee( const Iterator &it )
 {
  d->mRemovedAddressees.append( (*it) );
  d->mAddressees.remove( it.d->mIt );
 }
 AddressBook::Iterator AddressBook::find( const Addressee &a )
 {
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( a.uid() == (*it).uid() ) {
      return it;
    }
  }
  return end();
 }
 Addressee AddressBook::findByUid( const QString &uid )
 {
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( uid == (*it).uid() ) {
      return *it;
    }
  }
  return Addressee();
 }
 void AddressBook::preExternSync( AddressBook* aBook, const QString& csd , bool isSubset )
 {
    //qDebug("AddressBook::preExternSync ");
    AddressBook::Iterator it;  
    for ( it = begin(); it != end(); ++it ) {
        (*it).setID( csd, (*it).externalUID() );
        (*it).computeCsum( csd );
    }
    mergeAB( aBook ,csd, isSubset );  
 }
 void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool setID)
 {
    //qDebug("AddressBook::postExternSync ");
    AddressBook::Iterator it;  
    for ( it = begin(); it != end(); ++it ) {
        //qDebug("check uid %s ", (*it).uid().latin1() );
        if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
-             (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) {
+             (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ||
+             (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL) {
            Addressee ad = aBook->findByUid( ( (*it).uid() ));
            if ( ad.isEmpty() ) {
                qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1());
            } else {
                (*it).setIDStr(":");
-                (*it).computeCsum( csd );
                if ( setID ) {
                    if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
                        ad.setID( csd, (*it).externalUID() );
                } else
                    ad.setID( csd, (*it).uid() );
+                (*it).computeCsum( csd );
                ad.setCsum( csd, (*it).getCsum( csd ) );
-                aBook->insertAddressee( ad );
+                //qDebug("CSUM %s ",(*it).getCsum( csd ).latin1() );
+                aBook->insertAddressee( ad , false);
            }
        }
    }
 }
 bool   AddressBook::containsExternalUid( const QString& uid  )
 {
    Iterator it;
    for ( it = begin(); it != end(); ++it ) {
        if ( uid == (*it).externalUID( ) )
            return true;
    }
    return false;
 }
 Addressee   AddressBook::findByExternUid( const QString& uid , const QString& profile  )
 {
    Iterator it;
    for ( it = begin(); it != end(); ++it ) {
        if ( uid == (*it).getID( profile ) )
            return (*it);
    }
    return Addressee();
 }
 void  AddressBook::mergeAB( AddressBook *aBook, const QString& profile , bool isSubset )
 {
    Iterator it;
    Addressee ad;
    for ( it = begin(); it != end(); ++it ) {
        ad = aBook->findByExternUid( (*it).externalUID(), profile );
            if ( !ad.isEmpty() ) {
                (*it).mergeContact( ad ,isSubset);
            }
    }
 #if 0 
    // test only
    for ( it = begin(); it != end(); ++it ) {
        
        qDebug("uid %s ", (*it).uid().latin1());
    }
 #endif
 }
 #if 0
 Addressee::List AddressBook::getExternLastSyncAddressees()
 {
    Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( (*it).uid().left( 19 ) == "last-syncAddressee-"  ) {
        if ( (*it).familyName().left(4) == "!E: " )
            results.append( *it );
    }
  }
  return results;
 }
 #endif
 void AddressBook::resetTempSyncStat()
 {
    Iterator it;
  for ( it = begin(); it != end(); ++it ) {
      (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL );
  }
 }
 
 QStringList AddressBook:: uidList()
 {
    QStringList results;
    Iterator it;
    for ( it = begin(); it != end(); ++it ) {
        results.append( (*it).uid() );
    }
    return results;
 }
 Addressee::List AddressBook::allAddressees()
 {
   return d->mAddressees; 
 
 }
 Addressee::List AddressBook::findByName( const QString &name )
 {
  Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( name == (*it).realName() ) {
      results.append( *it );
    }
  }
  return results;
 }
 Addressee::List AddressBook::findByEmail( const QString &email )
 {
  Addressee::List results;
  QStringList mailList;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    mailList = (*it).emails();
    for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
      if ( email == (*ite) ) {
        results.append( *it );
      }
    }
  }
  return results;
 }
 Addressee::List AddressBook::findByCategory( const QString &category )
 {
  Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( (*it).hasCategory( category) ) {
      results.append( *it );
    }
  }
  return results;
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index d5a110a..3d4992c 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -84,314 +84,324 @@ struct Addressee::AddresseeData : public KShared
  QStringList categories;
  QStringList custom;
  int mTempSyncStat;
  Resource *resource;
  bool empty    :1;
  bool changed  :1;
  bool tagged   :1;
 };
 Addressee::Addressee()
 {
  mData = new AddresseeData;
  mData->empty = true;
  mData->changed = false;
  mData->resource = 0;
  mData->mExternalId = ":";
  mData->revision = QDateTime ( QDate( 2003,1,1));
  mData->mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
 }
 Addressee::~Addressee()
 {
 }
 Addressee::Addressee( const Addressee &a )
 {
  mData = a.mData;
 }
 Addressee &Addressee::operator=( const Addressee &a )
 {
  mData = a.mData;
  return (*this);
 }
 Addressee Addressee::copy()
 {
  Addressee a;
  *(a.mData) = *mData;
  return a;
 }
 void Addressee::detach()
 {
  if ( mData.count() == 1 ) return;
  *this = copy();
 }
 bool Addressee::operator==( const Addressee &a ) const
 {
  if ( uid() != a.uid() ) return false;
  if ( mData->name != a.mData->name ) return false;
  if ( mData->formattedName != a.mData->formattedName ) return false;
  if ( mData->familyName != a.mData->familyName ) return false;
  if ( mData->givenName != a.mData->givenName ) return false;
  if ( mData->additionalName != a.mData->additionalName ) return false;
  if ( mData->prefix != a.mData->prefix ) return false;
  if ( mData->suffix != a.mData->suffix ) return false;
  if ( mData->nickName != a.mData->nickName ) return false;
  if ( mData->birthday != a.mData->birthday ) return false;
  if ( mData->mailer != a.mData->mailer ) return false;
  if ( mData->timeZone != a.mData->timeZone ) return false;
  if ( mData->geo != a.mData->geo ) return false;
  if ( mData->title != a.mData->title ) return false;
  if ( mData->role != a.mData->role ) return false;
  if ( mData->organization != a.mData->organization ) return false;
  if ( mData->note != a.mData->note ) return false;
  if ( mData->productId != a.mData->productId ) return false;
  //if ( mData->revision != a.mData->revision ) return false;
  if ( mData->sortString != a.mData->sortString ) return false;
  if ( mData->secrecy != a.mData->secrecy ) return false;
  if ( mData->logo != a.mData->logo ) return false;
  if ( mData->photo != a.mData->photo ) return false;
  if ( mData->sound != a.mData->sound ) return false;
  if ( mData->agent != a.mData->agent ) return false;
  if ( ( mData->url.isValid() || a.mData->url.isValid() ) &&
       ( mData->url != a.mData->url ) ) return false;
  if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false;
  if ( mData->addresses != a.mData->addresses ) return false;
  if ( mData->keys != a.mData->keys ) return false;
  if ( mData->emails != a.mData->emails ) return false;
  if ( mData->categories != a.mData->categories ) return false;
  if ( mData->custom != a.mData->custom ) return false;
  return true;
 }
 bool Addressee::operator!=( const Addressee &a ) const
 {
  return !( a == *this );
 }
 bool Addressee::isEmpty() const
 {
  return mData->empty;
 }
 ulong  Addressee::getCsum4List( const QStringList &  attList)
 {
    int max = attList.count();
    ulong cSum = 0;
    int j,k,i;
    int add;
    for ( i = 0; i < max ; ++i ) {
        QString s = attList[i];
        if ( ! s.isEmpty() ){
            j = s.length();
            for ( k = 0; k < j; ++k ) {
                int mul = k +1;
                add = s[k].unicode ();
                if ( k < 16 )
                    mul = mul * mul;
                int ii = i+1;
                add = add * mul *ii*ii*ii;
                cSum += add;
            }
        }
            
    }
    //QString dump = attList.join(",");
    //qDebug("csum: %d %s", cSum,dump.latin1()); 
    
    return cSum;
 }
 void Addressee::computeCsum(const QString &dev)
 {
    QStringList l;
-    if ( !mData->name.isEmpty() ) l.append(mData->name);
+    //if ( !mData->name.isEmpty() ) l.append(mData->name);
-    if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName  );
+    //if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName  );
    if ( !mData->familyName.isEmpty()  ) l.append( mData->familyName );
    if ( !mData->givenName.isEmpty() ) l.append(mData->givenName  );
-    if ( !mData->additionalName  ) l.append( mData->additionalName );
+    if ( !mData->additionalName.isEmpty()  ) l.append( mData->additionalName );
    if ( !mData->prefix.isEmpty()  ) l.append( mData->prefix );
    if ( !mData->suffix.isEmpty()  ) l.append( mData->suffix );
    if ( !mData->nickName.isEmpty()  ) l.append( mData->nickName );
    if ( mData->birthday.isValid()  ) l.append( mData->birthday.toString() );
    if ( !mData->mailer.isEmpty() ) l.append( mData->mailer );
    if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() );
    if ( mData->geo.isValid() ) l.append( mData->geo.asString() );
    if ( !mData->title .isEmpty() ) l.append( mData->title );
    if ( !mData->role.isEmpty() ) l.append( mData->role );
    if ( !mData->organization.isEmpty() ) l.append( mData->organization ); 
    if ( !mData->note.isEmpty() ) l.append( mData->note ); 
    if ( !mData->productId.isEmpty() ) l.append(mData->productId ); 
    if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); 
    if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); 
    // if ( !mData->logo.isEmpty() ) l.append(  ); 
    //if ( !mData->photo.isEmpty() ) l.append(  );
    //if ( !mData->sound.isEmpty() ) l.append(  );
    //if ( !mData->agent.isEmpty() ) l.append(  ); 
    if (  mData->url.isValid() )
        if ( ! mData->url.path().isEmpty()) l.append( mData->url.path()  ); 
    KABC::PhoneNumber::List phoneNumbers;
    KABC::PhoneNumber::List::Iterator phoneIter;
    QStringList t;
    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
          ++phoneIter )
        t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) );
    t.sort();
    uint iii;
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->emails;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->categories;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii)
        l.append( t[iii]  );
    t = mData->custom;
    t.sort();
    for ( iii = 0; iii < t.count(); ++iii)
-        l.append( t[iii]  );
+        if ( t[iii].left( 25 ) != "KADDRESSBOOK-X-ExternalID" ) {
+            int find = t[iii].find (':')+1;
+            //qDebug("lennnn %d %d  ", find, t[iii].length());
+            if ( find < t[iii].length())
+                 l.append( t[iii]  );
+        }
    KABC::Address::List::Iterator addressIter;
    for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
          ++addressIter ) {
        t = (*addressIter).asList();
        t.sort();
        for ( iii = 0; iii < t.count(); ++iii)
            l.append( t[iii]  );
    }
    uint cs = getCsum4List(l);
-    //qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
+#if 1
+    for ( iii = 0; iii < l.count(); ++iii)
+        qDebug("%d***%s***",iii,l[iii].latin1());
+    qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
+#endif
    setCsum( dev, QString::number (cs ));
 }
 void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
 {
    detach();
    if ( mData->name.isEmpty() ) mData->name = ad.mData->name;
    if ( mData->formattedName.isEmpty() ) mData->formattedName  = ad.mData->formattedName;
    if ( mData->familyName.isEmpty()  )  mData->familyName  = ad.mData->familyName;
    if ( mData->givenName.isEmpty() ) mData->givenName   = ad.mData->givenName ;
    if ( mData->additionalName )  mData->additionalName  = ad.mData->additionalName;
    if ( mData->prefix.isEmpty() )  mData->prefix  = ad.mData->prefix;
    if ( mData->suffix.isEmpty() )  mData->suffix  = ad.mData->suffix;
    if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
    if ( !mData->birthday.isValid() ) 
        if ( ad.mData->birthday.isValid()) 
            mData->birthday =  ad.mData->birthday;
    if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer;
    if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone;
    if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo;
    if ( mData->title .isEmpty() ) mData->title = ad.mData->title  ;
    if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
    if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
    if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; 
    if ( mData->productId.isEmpty() ) mData->productId  = ad.mData->productId; 
    if ( mData->sortString.isEmpty() )  mData->sortString  = ad.mData->sortString; 
    if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy;
    if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ;
    QStringList t;
    QStringList tAD;
    uint iii;
    // ********** phone numbers
    PhoneNumber::List phoneAD = ad.phoneNumbers();
    PhoneNumber::List::Iterator phoneItAD;
    for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) {
        bool found = false;
        PhoneNumber::List::Iterator it;
        for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
            if ( ( *phoneItAD ).contains( (*it)  ) ) {
                found = true;
                (*it).setType( ( *phoneItAD ).type() );
                (*it).setNumber( ( *phoneItAD ).number() );
                break;
            }
        }
        if ( isSubSet && ! found )
            mData->phoneNumbers.append( *phoneItAD );                
    }
    if ( isSubSet ) {
        // ************* emails;
        t = mData->emails;
        tAD = ad.mData->emails;
        for ( iii = 0; iii < tAD.count(); ++iii)
            if ( !t.contains(tAD[iii] ) )
                mData->emails.append( tAD[iii] );
    }
    // ************* categories;
    t = mData->categories;
    tAD = ad.mData->categories;
    for ( iii = 0; iii < tAD.count(); ++iii)
        if ( !t.contains(tAD[iii] ) )
            mData->categories.append( tAD[iii] );
    QStringList::ConstIterator it;
    for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) {
        QString qualifiedName = (*it).left( (*it).find( ":" )); 
        bool found = false;
        QStringList::ConstIterator itL;
        for( itL = mData->custom.begin(); itL != mData->custom.end(); ++itL ) {
            if ( (*itL).startsWith( qualifiedName ) ) {
                found = true;
                break;
            }
        }
        if ( ! found ) {
            mData->custom.append( *it );
        }
    }
    if ( mData->logo.undefined() && !ad.mData->logo.undefined() ) mData->logo = ad.mData->logo;
    if ( mData->photo.undefined() && !ad.mData->photo.undefined() ) mData->photo = ad.mData->photo;
    if ( !mData->sound.isIntern() ) {
        if ( mData->sound.url().isEmpty() ) {
            mData->sound = ad.mData->sound;
        }
    }
    if ( !mData->agent.isIntern() ) {
        if ( mData->agent.url().isEmpty() ) {
            mData->agent = ad.mData->agent;
        }
    }
    { 
        Key::List::Iterator itA;
        for( itA = ad.mData->keys.begin(); itA != ad.mData->keys.end(); ++itA ) {
            bool found = false;
            Key::List::Iterator it;
            for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
                if ( (*it) == (*itA)) {
                    found = true;
                    break;
                    
                }
            }
            if ( ! found ) {
                mData->keys.append( *itA );
            }
        }
    }
    KABC::Address::List::Iterator addressIterA;
    for ( addressIterA = ad.mData->addresses.begin(); addressIterA != ad.mData->addresses.end(); ++addressIterA ) {
        bool found = false;
        KABC::Address::List::Iterator addressIter;
        for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
              ++addressIter ) {
            if ( (*addressIter) == (*addressIterA)) {
                found = true;
                (*addressIter).setType( (*addressIterA).type() );
                break;
            }
        }
        if ( isSubSet && ! found ) {
            mData->addresses.append( *addressIterA );
        }
    }
    //qDebug("merge contact %s ", ad.uid().latin1());
    setUid( ad.uid() );
@@ -986,257 +996,260 @@ TimeZone Addressee::timeZone() const
  return mData->timeZone;
 }
 QString Addressee::timeZoneLabel()
 {
  return i18n("Time Zone");
 }
 void Addressee::setGeo( const Geo &geo )
 {
  if ( geo == mData->geo ) return;
  detach();
  mData->empty = false;
  mData->geo = geo;
 }
 Geo Addressee::geo() const
 {
  return mData->geo;
 }
 QString Addressee::geoLabel()
 {
  return i18n("Geographic Position");
 }
 void Addressee::setTitle( const QString &title )
 {
  if ( title == mData->title ) return;
  detach();
  mData->empty = false;
  mData->title = title;
 }
 QString Addressee::title() const
 {
  return mData->title;
 }
 QString Addressee::titleLabel()
 {
  return i18n("Title");
 }
 void Addressee::setRole( const QString &role )
 {
  if ( role == mData->role ) return;
  detach();
  mData->empty = false;
  mData->role = role;
 }
 QString Addressee::role() const
 {
  return mData->role;
 }
 QString Addressee::roleLabel()
 {
  return i18n("Role");
 }
 void Addressee::setOrganization( const QString &organization )
 {
  if ( organization == mData->organization ) return;
  detach();
  mData->empty = false;
  mData->organization = organization;
 }
 QString Addressee::organization() const
 {
  return mData->organization;
 }
 QString Addressee::organizationLabel()
 {
  return i18n("Organization");
 }
 void Addressee::setNote( const QString &note )
 {
  if ( note == mData->note ) return;
  detach();
  mData->empty = false;
  mData->note = note;
 }
 QString Addressee::note() const
 {
  return mData->note;
 }
 QString Addressee::noteLabel()
 {
  return i18n("Note");
 }
 void Addressee::setProductId( const QString &productId )
 {
  if ( productId == mData->productId ) return;
  detach();
  mData->empty = false;
  mData->productId = productId;
 }
 QString Addressee::productId() const
 {
  return mData->productId;
 }
 QString Addressee::productIdLabel()
 {
  return i18n("Product Identifier");
 }
 void Addressee::setRevision( const QDateTime &revision )
 {
  if ( revision == mData->revision ) return;
  detach();
  mData->empty = false;
-  mData->revision = revision;
+  mData->revision = QDateTime( revision.date(),
+                               QTime (revision.time().hour(),
+                                      revision.time().minute(),
+                                      revision.time().second()));
 }
 QDateTime Addressee::revision() const
 {
  return mData->revision;
 }
 QString Addressee::revisionLabel()
 {
  return i18n("Revision Date");
 }
 void Addressee::setSortString( const QString &sortString )
 {
  if ( sortString == mData->sortString ) return;
  detach();
  mData->empty = false;
  mData->sortString = sortString;
 }
 QString Addressee::sortString() const
 {
  return mData->sortString;
 }
 QString Addressee::sortStringLabel()
 {
  return i18n("Sort String");
 }
 void Addressee::setUrl( const KURL &url )
 {
  if ( url == mData->url ) return;
  detach();
  mData->empty = false;
  mData->url = url;
 }
 KURL Addressee::url() const
 {
  return mData->url;
 }
 QString Addressee::urlLabel()
 {
  return i18n("URL");
 }
 void Addressee::setSecrecy( const Secrecy &secrecy )
 {
  if ( secrecy == mData->secrecy ) return;
  detach();
  mData->empty = false;
  mData->secrecy = secrecy;
 }
 Secrecy Addressee::secrecy() const
 {
  return mData->secrecy;
 }
 QString Addressee::secrecyLabel()
 {
  return i18n("Security Class");
 }
 void Addressee::setLogo( const Picture &logo )
 {
  if ( logo == mData->logo ) return;
  detach();
  mData->empty = false;
  mData->logo = logo;
 }
 Picture Addressee::logo() const
 {
  return mData->logo;
 }
 QString Addressee::logoLabel()
 {
  return i18n("Logo");
 }
 void Addressee::setPhoto( const Picture &photo )
 {
  if ( photo == mData->photo ) return;
  detach();
  mData->empty = false;
  mData->photo = photo;
 }
 Picture Addressee::photo() const
 {
  return mData->photo;
 }
 QString Addressee::photoLabel()
 {
  return i18n("Photo");
 }
 void Addressee::setSound( const Sound &sound )
 {
  if ( sound == mData->sound ) return;
  detach();
  mData->empty = false;
  mData->sound = sound;
 }
 Sound Addressee::sound() const
 {
  return mData->sound;
 }
 QString Addressee::soundLabel()
 {
  return i18n("Sound");
 }
 void Addressee::setAgent( const Agent &agent )
author	zautrix <zautrix>	2004-10-29 09:03:54 (UTC)
committer	zautrix <zautrix>	2004-10-29 09:03:54 (UTC)
commit	6500d6ebb080f1de58fe676aa0a730d47fcf64f5 (patch) (unidiff)
tree	41841e05bf1e6b88e6e55f42011dce5f6bed85b4 /kabc
parent	41e3625b8c38ff45e70b59416a519d59a5f4d937 (diff)
download	kdepimpi-6500d6ebb080f1de58fe676aa0a730d47fcf64f5.zip kdepimpi-6500d6ebb080f1de58fe676aa0a730d47fcf64f5.tar.gz kdepimpi-6500d6ebb080f1de58fe676aa0a730d47fcf64f5.tar.bz2