1 files changed, 80 insertions, 39 deletions

diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index b065bf3..f3bf2c5 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -21,21 +21,23 @@
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "kglobal.h"
+#include <qregexp.h>
 
 
 #include "sharpdtmconverter.h"
 
 #include <sl/slcategories.h>
+#include <libkdepim/ksyncprofile.h>
 //US #include <qpe/categoryselect.h>
 
 
 using namespace KABC;
 using namespace SlCategory;
 
 SharpDTMConverter::SharpDTMConverter() : catDB(0)
 {
@@ -68,40 +70,48 @@ void SharpDTMConverter::deinit()
 
 bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr )
 {
 	SlZDataBase* db = (SlZDataBase*)database;
 
     // for syncing: we need setting of the two fields
     addr.setExternalUID( QString::number( contact ) );
     addr.setOriginalExternalUID( QString::number( contact ) ); 
+    addr.setTempSyncStat(  SYNC_TEMPSTATE_NEW_EXTERNAL );
 
 
     // name
-    qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!");
-    addr.setFormattedName(db->readField(ZdbAdrs::FileAs));
+    //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!");
+    addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); // needs fix
 
     addr.setFamilyName( db->readField(ZdbAdrs::LastName) );
     addr.setGivenName( db->readField(ZdbAdrs::FirstName) );
     addr.setAdditionalName( db->readField(ZdbAdrs::MiddleName) );
     addr.setPrefix( db->readField(ZdbAdrs::Title) );
     addr.setSuffix( db->readField(ZdbAdrs::Suffix) );
 
 
-    // email
     QString emailstr = db->readField(ZdbAdrs::Emails);
-    qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1());
-    QStringList emails = QStringList::split(",", emailstr);
-
+    emailstr.replace( QRegExp(","), " " ); 
+    emailstr.replace( QRegExp(";"), " " ); 
+    emailstr.replace( QRegExp(":"), " " ); 
+    //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1());
+    QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace());
+    bool defE = false;
+    bool found = false;
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
-      addr.insertEmail( *it, ((*it) == db->readField(ZdbAdrs::DefaultEmail)) );
+        if (found )
+            defE = false;
+        else
+            found = defE = ((*it).lower() == db->readField(ZdbAdrs::DefaultEmail).lower());
+      addr.insertEmail( *it, defE );
     }
-
-    if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty())
-      addr.insertEmail(db->readField(ZdbAdrs::DefaultEmail), true);
+    if ( ! found )
+        if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty())
+            addr.insertEmail(db->readField(ZdbAdrs::DefaultEmail), true);
 
     // home
     if ((!db->readField(ZdbAdrs::HomeStreet).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeCity).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeState).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeZip).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeCountry).isEmpty()))
     {
@@ -193,99 +203,101 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     if (!db->readField(ZdbAdrs::BusinessPager).isEmpty())
     {
       PhoneNumber businesspager;
       businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager );
       businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) );
       addr.insertPhoneNumber( businesspager );
     }
 
-    addr.setRole( db->readField(ZdbAdrs::JobTitle) ); //?
+    addr.setRole( db->readField(ZdbAdrs::JobTitle) );
     addr.setOrganization( db->readField(ZdbAdrs::Company) );
     addr.insertCustom( "KADDRESSBOOK", "X-Profession", db->readField(ZdbAdrs::Profession) );
     addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", db->readField(ZdbAdrs::Assistant) );
     addr.insertCustom( "KADDRESSBOOK", "X-Department", db->readField(ZdbAdrs::Department) );
     addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", db->readField(ZdbAdrs::Manager) );
     addr.insertCustom( "KADDRESSBOOK", "X-Office", db->readField(ZdbAdrs::Office) );
 
     //personal
     addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) );
 
 	QString gen = db->readField(ZdbAdrs::Gender);
-	qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1());
-	qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited");
+	//qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1());
+	//qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited");
 
     if (gen == "male")
       addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male");
     else if (gen == "female")
       addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female");
 
 
-	QDate ann = db->readDateField(ZdbAdrs::Anniversary);
-
+    QDate ann = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Anniversary) ); 
     if (ann.isValid()) {
       QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate);
-//US
-//      qDebug("QtopiaConverter::qtopiaToAddressee found:%s", dt.latin1());
+      //qDebug("qtopiaToAddressee annyversary found:%s", dt.latin1());
       addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
     }
+  
 
     addr.insertCustom( "KADDRESSBOOK", "X-Children", db->readField(ZdbAdrs::Children) );
 
 
-	QDate birthd = db->readDateField(ZdbAdrs::Birthday);
+    QDate birthd = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Birthday) );
+    //qDebug("birtd %s ", birthd.toString().latin1());
     if (birthd.isValid())
       addr.setBirthday( birthd );
 
     addr.setNickName( db->readField(ZdbAdrs::Nickname) );
 
     // others
     //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available.
     QString notes = db->readField(ZdbAdrs::Notes);
-    notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n";
-
+    //notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n";
+    if ( addr.url().isEmpty() )
+        addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) );
     addr.setNote( db->readField(ZdbAdrs::Notes) );
 
 
 
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
-	qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" );
+	//qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" );
     QArray<int> catArray = db->readCategories();
     QString cat;
 
     for ( unsigned int i=0; i < catArray.size(); i++ ) {
       cat = catDB->label(catArray[i]);
       if ( cat.isEmpty() )
         addr.insertCategory(QString::number(catArray[i]));
       else
         addr.insertCategory( cat );
     }
 
     return true;
 }
 
 bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact )
 {
+    bool cellHome = false, cellWork = false;
     // name
     database->writeField(ZdbAdrs::LastName, addr.familyName());
     database->writeField(ZdbAdrs::FirstName, addr.givenName());
     database->writeField(ZdbAdrs::MiddleName, addr.additionalName());
     database->writeField(ZdbAdrs::Title, addr.prefix());
     database->writeField(ZdbAdrs::Suffix, addr.suffix());
 
-    qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!");
+    //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() );
     database->writeField(ZdbAdrs::FileAs, addr.formattedName());
-
+    database->writeField(ZdbAdrs::FullName, addr.formattedName());
 
     // email
-    qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!");
-    qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee");
-    QString emails = addr.emails().join(",");
+    //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!");
+    //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee");
+    QString emails = addr.emails().join(" ");
     database->writeField(ZdbAdrs::Emails, emails );
 
     database->writeField(ZdbAdrs::DefaultEmail, addr.preferredEmail() );
 
 
     // home
     const Address homeaddress = addr.address(Address::Home);
     if (!homeaddress.isEmpty()) {
@@ -300,18 +312,20 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     if (!homephone.number().isEmpty())
       database->writeField(ZdbAdrs::HomePhone, homephone.number());
 
     PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax );
     if (!homefax.number().isEmpty())
       database->writeField(ZdbAdrs::HomeFax, homefax.number());
 
     PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell );
-    if (!homemobile.number().isEmpty())
+    if (!homemobile.number().isEmpty()) {
       database->writeField(ZdbAdrs::HomeMobile, homemobile.number());
+      cellHome = true;
+    }
 
     database->writeField(ZdbAdrs::HomeWebPage, addr.url().url());
 
 
     // business
     const Address businessaddress = addr.address(Address::Work);
     if (!businessaddress.isEmpty()) {
       database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street());
@@ -325,18 +339,27 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     if (!businessphone.number().isEmpty())
       database->writeField(ZdbAdrs::BusinessPhone, businessphone.number());
 
     PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax );
     if (!businessfax.number().isEmpty())
       database->writeField(ZdbAdrs::BusinessFax, businessfax.number());
 
     PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell );
-    if (!businessmobile.number().isEmpty())
-      database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number());
+    if (!businessmobile.number().isEmpty()) {
+        cellWork = true;
+        database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number());
+    }
+    PhoneNumber mobile = addr.phoneNumber( PhoneNumber::Cell );
+    if (!businessmobile.number().isEmpty()) {
+        if ( ! cellHome ) 
+            database->writeField(ZdbAdrs::HomeMobile, mobile.number());
+        else if (! cellWork )
+            database->writeField(ZdbAdrs::BusinessMobile, mobile.number());
+    }
 
     PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager );
     if (!businesspager.number().isEmpty())
       database->writeField(ZdbAdrs::BusinessPager, businesspager.number());
 
     database->writeField(ZdbAdrs::JobTitle, addr.role());
     database->writeField(ZdbAdrs::Company, addr.organization());
 
@@ -345,46 +368,64 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     database->writeField(ZdbAdrs::Department, addr.custom( "KADDRESSBOOK", "X-Department" ));
     database->writeField(ZdbAdrs::Manager, addr.custom( "KADDRESSBOOK", "X-ManagersName" ));
     database->writeField(ZdbAdrs::Office, addr.custom( "KADDRESSBOOK", "X-Office" ));
 
     //personal
     database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" ));
 
     QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" );
-	qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1());
-	qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?");
-	qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee");
-    if (gt = "male")
+	//qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1());
+	//qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?");
+	//qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee");
+    if (gt == "male")
       database->writeField(ZdbAdrs::Gender, "male");
-    else if (gt = "female")
+    else if (gt == "female")
       database->writeField(ZdbAdrs::Gender, "female");
     else
       database->writeField(ZdbAdrs::Gender, "");
 
 
     QDate dt = KGlobal::locale()->readDate(
             addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate
-    database->writeField(ZdbAdrs::Anniversary, dt );
-
+    if ( dt.isValid() ) {
+        QString dateS =  KGlobal::locale()->formatDate(dt, true  );
+        database->writeField(ZdbAdrs::Anniversary, dateS );
+    }
     database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" ));
-
-    database->writeField(ZdbAdrs::Birthday, addr.birthday().date());
+    dt = addr.birthday().date();
+    if ( dt.isValid() ) {
+        QString dateS =  KGlobal::locale()->formatDate(dt, true );
+        database->writeField(ZdbAdrs::Birthday, dateS);
+    }
     database->writeField(ZdbAdrs::Nickname, addr.nickName());
 
     // other
     database->writeField(ZdbAdrs::Notes, addr.note());
 
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
 
-	qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works");
+	//qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works");
 
     QStringList cats = addr.categories();
+    int ii;
+    for ( ii = 0; ii < cats.count() ;++ii ) {
+        if ( !catDB->exists( cats[ii]  ))
+            catDB->addCategory(cats[ii]);
+    }
     QArray<int> iar;
     if ( !cats.isEmpty() ) {
       QArray<int> iar = catDB->ids(cats);
+      qDebug("***cat count is %d ", iar.count());
       database->updateCategories(contact, iar);
     }
 
     return true;
 }
+
+QDate SharpDTMConverter::convertDate( QString  s)
+{
+    QDate dt = KGlobal::locale()->readDate( s ); 
+    return dt;
+    return QDate ();
+}