1 files changed, 34 insertions, 41 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index cb10160..2aca559 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -182,349 +182,342 @@ 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->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->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]  );
     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() );
     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;
     if ( isSubSet ) {
         // ********** 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 ( (*it) == ( *phoneItAD ) ) {
+                if ( ( *phoneItAD ).contains( (*it)  ) ) {
                     found = true;
+                    (*it).setType( ( *phoneItAD ).type() );
                     break;
                 }
             }
             if ( ! found )
                 mData->phoneNumbers.append( *phoneItAD );                
         }
         // ************* 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;
         }
     }
-
-#if 0
-
- 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]  );
-    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]  );
+    { 
+        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;
+            }
 
-#endif
-
-    // pending:
-    // merging addresses
-    // merging keys
+        }
+        if ( ! found ) {
+            mData->addresses.append( *addressIterA );
+        }
+    }
     //qDebug("merge contact %s ", ad.uid().latin1());
     setUid( ad.uid() );
     setRevision( ad.revision() );
 }
 
 bool Addressee::removeVoice()
 {
     PhoneNumber::List phoneN = phoneNumbers();
     PhoneNumber::List::Iterator phoneIt;
     bool found = false;
     for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
         if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
             if ((*phoneIt).type() - PhoneNumber::Voice ) {
                 (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice );
                 insertPhoneNumber( (*phoneIt) );
                 found = true;
             }
         }
         
     }
     return found;
 }
 
 bool Addressee::containsAdr(const Addressee& ad )
 {
     if ( ! ad.mData->familyName.isEmpty()  )  if ( mData->familyName  != ad.mData->familyName) return false;
     if ( ! ad.mData->givenName.isEmpty() )if (  mData->givenName   != ad.mData->givenName ) return false;
     if (  ad.mData->url.isValid() ) if (mData->url != ad.mData->url) return false ;
     if ( ! ad.mData->role.isEmpty() ) if (mData->role != ad.mData->role) return false ;
     if ( ! ad.mData->organization.isEmpty() ) if (mData->organization != ad.mData->organization) return false ; 
     if ( ! ad.mData->note.isEmpty() ) if (mData->note != ad.mData->note) return false ; 
     if ( ! ad.mData->title .isEmpty() ) if (mData->title != ad.mData->title ) return false ;
 
     // compare phone numbers
     PhoneNumber::List phoneN = ad.phoneNumbers();
     PhoneNumber::List::Iterator phoneIt;
     bool found = false;
     for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
         bool found = false;
         PhoneNumber::List phoneL = ad.phoneNumbers();
         PhoneNumber::List::Iterator phoneItL;
         for ( phoneItL = phoneL.begin(); phoneItL != phoneL.end(); ++phoneItL ) {
             if ( ( *phoneItL ).number() == ( *phoneIt ).number()  ) {
                 found = true;
                 break;
             }
         }
         if ( ! found )
             return false;
     }
     return true;
    
 }
 void Addressee::simplifyAddresses()
 {
     int max = 2;
     if (  mData->url.isValid() )
         max = 1; 
     if ( mData->addresses.count() <= max ) return ;
     int count = 0;
     Address::List list;
     Address::List::Iterator it;
     for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
         if ( count >= max )
             list.append( *it );
         ++count;
     }
     for( it = list.begin(); it != list.end(); ++it ) {
         removeAddress( (*it) );
     }
 }
 
 // removes all emails but the first 
 // needed by phone sync
 void Addressee::simplifyEmails()
 { 
     if ( mData->emails.count() == 0 ) return ;
     QString email = mData->emails.first();
     detach();
     mData->emails.clear();
     mData->emails.append( email );
 }
 
 void Addressee::simplifyPhoneNumbers()
 {
     KABC::PhoneNumber::List removeNumbers;
     KABC::PhoneNumber::List::Iterator phoneIter;
     for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
           ++phoneIter ) {
         if ( ! ( *phoneIter ).simplifyNumber() )
             removeNumbers.append( ( *phoneIter ) );
     }
     for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
           ++phoneIter ) {
         removePhoneNumber(( *phoneIter ));
     }
 }
 void Addressee::simplifyPhoneNumberTypes()
 {
     KABC::PhoneNumber::List::Iterator phoneIter;
     for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
           ++phoneIter )
         ( *phoneIter ).simplifyType();
 }
 void Addressee::removeID(const QString &prof)
 {
     detach();
     mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
     
 }
 void Addressee::setID( const QString & prof , const QString & id )
 {
     detach();
     mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id );
     //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
 }
 void Addressee::setTempSyncStat( int id )
 {
     if ( mData->mTempSyncStat == id ) return;
     detach();
     mData->mTempSyncStat = id;
 }
 int Addressee::tempSyncStat() const
 {
     return mData->mTempSyncStat;
 }
 
 QString Addressee::getID( const QString &  prof)