1 files changed, 61 insertions, 50 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 3b238f5..82b4b9b 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -239,216 +239,227 @@ void Addressee::computeCsum(const QString &dev)
 
     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) 
         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);
 
 #if 0
     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)
 {
+    // merge all standard non-outlook fields. 
+    //if isSubSet (e.g. mobile phone sync) merge all fields
 
     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 ( isSubSet ) {
+        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->title .isEmpty() ) mData->title = ad.mData->title  ;
+        if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
+        if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
+        if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
+        if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; 
+        if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy;
+        if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ;
+        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 ) {
+        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 ) 
+            if (  ! found ) // LR try this one...
+                mData->phoneNumbers.append( *phoneItAD );                
         }
-        // if ( isSubSet && ! found ) 
-        if (  ! found ) // LR try this one...
-            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] );
+    if ( isSubSet ) {
+        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 ) {
+        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 );
+            }
+            if ( isSubSet && ! 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;
             }