6 files changed, 118 insertions, 97 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index adb451f..5fb49eb 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -112,259 +112,257 @@ Addressee *AddressBook::Iterator::operator->()
 AddressBook::Iterator &AddressBook::Iterator::operator++()
 {
  (d->mIt)++;
  return *this;
 }
 AddressBook::Iterator &AddressBook::Iterator::operator++(int)
 {
  (d->mIt)++;
  return *this;
 }
 AddressBook::Iterator &AddressBook::Iterator::operator--()
 {
  (d->mIt)--;
  return *this;
 }
 AddressBook::Iterator &AddressBook::Iterator::operator--(int)
 {
  (d->mIt)--;
  return *this;
 }
 bool AddressBook::Iterator::operator==( const Iterator &it )
 {
  return ( d->mIt == it.d->mIt );
 }
 bool AddressBook::Iterator::operator!=( const Iterator &it )
 {
  return ( d->mIt != it.d->mIt );
 }
 AddressBook::ConstIterator::ConstIterator()
 {
  d = new ConstIteratorData;
 }
 AddressBook::ConstIterator::ConstIterator( const AddressBook::ConstIterator &i )
 {
  d = new ConstIteratorData;
  d->mIt = i.d->mIt;
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator=( const AddressBook::ConstIterator &i )
 {
  if( this  == &i ) return *this; // guard for self assignment
  delete d; // delete the old data because the Iterator was really constructed before
  d = new ConstIteratorData;
  d->mIt = i.d->mIt;
  return *this;
 }
 AddressBook::ConstIterator::~ConstIterator()
 {
  delete d;
 }
 const Addressee &AddressBook::ConstIterator::operator*() const
 {
  return *(d->mIt);
 }
 const Addressee* AddressBook::ConstIterator::operator->() const
 {
  return &(*(d->mIt));
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++()
 {
  (d->mIt)++;
  return *this;
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++(int)
 {
  (d->mIt)++;
  return *this;
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--()
 {
  (d->mIt)--;
  return *this;
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--(int)
 {
  (d->mIt)--;
  return *this;
 }
 bool AddressBook::ConstIterator::operator==( const ConstIterator &it )
 {
  return ( d->mIt == it.d->mIt );
 }
 bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
 {
  return ( d->mIt != it.d->mIt );
 }
 AddressBook::AddressBook()
 {
  init(0, "contact");
 }
 AddressBook::AddressBook( const QString &config )
 {
  init(config, "contact");
 }
 AddressBook::AddressBook( const QString &config, const QString &family )
 {
  init(config, family);
 }
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
  blockLSEchange = false;
  d = new AddressBookData;
  QString fami = family;
-  qDebug("new ab ");
  if (config != 0) {
-      qDebug("config != 0 ");
      if ( family == "syncContact" ) {
          qDebug("creating sync config ");
          fami = "contact";
          KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
          con->setGroup( "General" );
          con->writeEntry( "ResourceKeys", QString("sync") );
          con->writeEntry( "Standard", QString("sync") );
          con->setGroup( "Resource_sync" );
          con->writeEntry( "FileName", config );
          con->writeEntry( "FileFormat", QString("vcard") );
          con->writeEntry( "ResourceIdentifier", QString("sync") );
          con->writeEntry( "ResourceName", QString("sync_res") );
          if ( config.right(4) == ".xml" )
              con->writeEntry( "ResourceType", QString("qtopia") );
          else if (  config == "sharp"            ) {
              con->writeEntry( "ResourceType", QString("sharp") );
          } else {
              con->writeEntry( "ResourceType", QString("file") );
          }
          //con->sync();
          d->mConfig = con;
      }
      else
    d->mConfig = new KConfig( locateLocal("config", config) );
 //    qDebug("AddressBook::init 1  config=%s",config.latin1() );
  }
  else {
    d->mConfig = 0;
 //    qDebug("AddressBook::init 1  config=0");
  }
 //US  d->mErrorHandler = 0;
  d->mManager = new KRES::Manager<Resource>( fami, false );
  d->mManager->readConfig( d->mConfig );
  if ( family == "syncContact" ) {
      KRES::Manager<Resource> *manager = d->mManager;
      KRES::Manager<Resource>::ActiveIterator it;
      for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
          (*it)->setAddressBook( this );
          if ( !(*it)->open() )
              error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
      }
      Resource *res = standardResource();
      if ( !res ) {
          qDebug("ERROR: no standard resource");
          res = manager->createResource( "file" );
          if ( res )
              {
                  addResource( res );
              }
          else
              qDebug(" No resource available!!!");
      }
      setStandardResource( res );
      manager->writeConfig();
  }
  addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                "X-Department", "KADDRESSBOOK" );
  addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                "X-Profession", "KADDRESSBOOK" );
  addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                "X-AssistantsName", "KADDRESSBOOK" );
  addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                "X-ManagersName", "KADDRESSBOOK" );
  addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                "X-SpousesName", "KADDRESSBOOK" );
  addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                "X-Office", "KADDRESSBOOK" );
  addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                "X-IMAddress", "KADDRESSBOOK" );
  addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                "X-Anniversary", "KADDRESSBOOK" );
  //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() ) );
      ok = false;
    }
  // 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 );
@@ -481,270 +479,270 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
                changed = true;
            (*it) = a;
            if ( (*it).resource() == 0 )
                (*it).setResource( standardResource() );
            if ( changed ) {
                if ( setRev ) {
              
                    // 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;
    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) );
    while ( it != end() ) {
        (*it).setRevision( dt );
        (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
        (*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() );
            ++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 )
 {
-    qDebug("AddressBook::preExternSync ");
+    //qDebug("AddressBook::preExternSync ");
    AddressBook::Iterator it;  
    for ( it = begin(); it != end(); ++it ) {
        (*it).setID( csd, (*it).externalUID() );
        (*it).computeCsum( csd );
    }
    mergeAB( aBook ,csd );  
 }
 void AddressBook::postExternSync( AddressBook* aBook , const QString& csd)
 {
-    qDebug("AddressBook::postExternSync ");
+    //qDebug("AddressBook::postExternSync ");
    AddressBook::Iterator it;  
    for ( it = begin(); it != end(); ++it ) {
-        qDebug("check uid %s ", (*it).uid().latin1() );
+        // qDebug("check uid %s ", (*it).uid().latin1() );
        if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
             (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) {
            Addressee ad = aBook->findByUid( ( (*it).uid() ));
            if ( ad.isEmpty() ) {
                qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1());
            } else {
                (*it).computeCsum( csd );
                if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
                    ad.setID( csd, (*it).externalUID() );
                ad.setCsum( csd, (*it).getCsum( csd ) );
                aBook->insertAddressee( ad );
            }
        }
    }
 }
 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  )
 {
    Iterator it;
    Addressee ad;
    for ( it = begin(); it != end(); ++it ) {
        ad = aBook->findByExternUid( (*it).externalUID(), profile );
            if ( !ad.isEmpty() ) {
                (*it).mergeContact( ad );
            }
    }
 #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 )
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index e241281..31ce1d6 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1,173 +1,175 @@
 /*** Warning! This file has been generated by the script makeaddressee ***/
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <kconfig.h>
 #include <ksharedptr.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kidmanager.h>
 //US
 #include <kstandarddirs.h>
 #include <libkcal/syncdefines.h>
 //US #include "resource.h"
 #include "addressee.h"
 using namespace KABC;
 static bool matchBinaryPattern( int value, int pattern );
+static bool matchBinaryPatternA( int value, int pattern );
+static bool matchBinaryPatternP( int value, int pattern );
 struct Addressee::AddresseeData : public KShared
 {
  QString uid;
  QString name;
  QString formattedName;
  QString familyName;
  QString givenName;
  QString additionalName;
  QString prefix;
  QString suffix;
  QString nickName;
  QDateTime birthday;
  QString mailer;
  TimeZone timeZone;
  Geo geo;
  QString title;
  QString role;
  QString organization;
  QString note;
  QString productId;
  QDateTime revision;
  QString sortString;
  QString externalUID;
  QString originalExternalUID;
  KURL url;
  Secrecy secrecy;
  Picture logo;
  Picture photo;
  Sound sound;
  Agent agent;
  QString mExternalId;
  PhoneNumber::List phoneNumbers;
  Address::List addresses;
  Key::List keys;
  QStringList emails;
  QStringList categories;
  QStringList custom;
  int mTempSyncStat;
  Resource *resource;
  bool empty    :1;
  bool changed  :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 );
 }
@@ -256,270 +258,270 @@ void Addressee::computeCsum(const QString &dev)
    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 )
 {
    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 ;
    // pending:
    // merging phonenumbers 
    // merging addresses
    // merging emails;
    // merging categories;
    // merging custom;
    // merging keys
    qDebug("merge contact %s ", ad.uid().latin1());
    setUid( ad.uid() );
 }
 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)
 {
    return KIdManager::getId ( mData->mExternalId, prof ); 
 }
 void Addressee::setCsum( const QString & prof , const QString & id )
 {
    detach();
    //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
    mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id );
    //qDebug("setcsum2 %s ",mData->mExternalId.latin1() );
 }
 QString Addressee::getCsum( const QString &  prof)
 {
    return KIdManager::getCsum ( mData->mExternalId, prof ); 
 }
 void Addressee::setIDStr( const QString & s )
 { 
    detach();
    mData->mExternalId = s;
 }
 QString Addressee::IDStr() const
 {
    return mData->mExternalId;
 }
 void Addressee::setExternalUID( const QString &id )
 {
  if ( id == mData->externalUID ) return;
  detach();
  mData->empty = false;
  mData->externalUID = id;
 }
 QString Addressee::externalUID() const
 {
  return mData->externalUID;
 }
 void Addressee::setOriginalExternalUID( const QString &id )
 {
  if ( id == mData->originalExternalUID ) return;
  detach();
  mData->empty = false;
-  qDebug("*******Set orig uid %s ", id.latin1());
+  //qDebug("*******Set orig uid %s ", id.latin1());
  mData->originalExternalUID = id;
 }
 QString Addressee::originalExternalUID() const
 {
  return mData->originalExternalUID;
 }
 void Addressee::setUid( const QString &id )
 {
  if ( id == mData->uid ) return;
  detach();
-  qDebug("****setuid %s ", id.latin1());
+  //qDebug("****setuid %s ", id.latin1());
  mData->empty = false;
  mData->uid = id;
 }
 QString Addressee::uid() const
 {
  if ( mData->uid.isEmpty() )
    mData->uid = KApplication::randomString( 10 );
  return mData->uid;
 }
 QString Addressee::uidLabel()
 {
  return i18n("Unique Identifier");
 }
 void Addressee::setName( const QString &name )
 {
  if ( name == mData->name ) return;
  detach();
  mData->empty = false;
  mData->name = name;
 }
 QString Addressee::name() const
 {
  return mData->name;
 }
 QString Addressee::nameLabel()
 {
  return i18n("Name");
 }
 void Addressee::setFormattedName( const QString &formattedName )
 {
  if ( formattedName == mData->formattedName ) return;
  detach();
  mData->empty = false;
  mData->formattedName = formattedName;
 }
 QString Addressee::formattedName() const
 {
  return mData->formattedName;
 }
 QString Addressee::formattedNameLabel()
 {
  return i18n("Formatted Name");
 }
 void Addressee::setFamilyName( const QString &familyName )
 {
  if ( familyName == mData->familyName ) return;
  detach();
  mData->empty = false;
  mData->familyName = familyName;
 }
 QString Addressee::familyName() const
 {
  return mData->familyName;
 }
 QString Addressee::familyNameLabel()
 {
  return i18n("Family Name");
 }
 void Addressee::setGivenName( const QString &givenName )
 {
  if ( givenName == mData->givenName ) return;
  detach();
  mData->empty = false;
  mData->givenName = givenName;
 }
 QString Addressee::givenName() const
 {
  return mData->givenName;
 }
 QString Addressee::givenNameLabel()
 {
  return i18n("Given Name");
 }
 void Addressee::setAdditionalName( const QString &additionalName )
 {
  if ( additionalName == mData->additionalName ) return;
  detach();
  mData->empty = false;
  mData->additionalName = additionalName;
 }
 QString Addressee::additionalName() const
 {
  return mData->additionalName;
 }
 QString Addressee::additionalNameLabel()
 {
  return i18n("Additional Names");
 }
 void Addressee::setPrefix( const QString &prefix )
 {
  if ( prefix == mData->prefix ) return;
  detach();
  mData->empty = false;
  mData->prefix = prefix;
 }
 QString Addressee::prefix() const
 {
  return mData->prefix;
 }
 QString Addressee::prefixLabel()
 {
  return i18n("Honorific Prefixes");
@@ -1165,494 +1167,494 @@ void Addressee::setNameFromString( const QString &str )
      leftOffset++;
    }
    QString additionalName;
    while ( leftOffset < rightOffset ) {
      additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] );
      leftOffset++;
    }
    setAdditionalName( additionalName );
  }
 }
 QString Addressee::realName() const
 {
  if ( !formattedName().isEmpty() )
    return formattedName();
  QString n = assembledName();
  if ( n.isEmpty() )
    n = name();
  return n;
 }
 QString Addressee::assembledName() const
 {
  QString name = prefix() + " " + givenName() + " " + additionalName() + " " +
              familyName() + " " + suffix();
  return name.simplifyWhiteSpace();
 }
 QString Addressee::fullEmail( const QString &email ) const
 {
  QString e;
  if ( email.isNull() ) {
    e = preferredEmail();
  } else {
    e = email;
  }
  if ( e.isEmpty() ) return QString::null;
  QString text;
  if ( realName().isEmpty() )
    text = e;
  else
    text = assembledName() + " <" + e + ">";
  return text;
 }
 void Addressee::insertEmail( const QString &email, bool preferred )
 {
  detach();
  QStringList::Iterator it = mData->emails.find( email );
  if ( it != mData->emails.end() ) {
    if ( !preferred || it == mData->emails.begin() ) return;
    mData->emails.remove( it );
    mData->emails.prepend( email );
  } else {
    if ( preferred ) {
      mData->emails.prepend( email );
    } else {
      mData->emails.append( email );
    }
  }
 }
 void Addressee::removeEmail( const QString &email )
 {
  detach();
  QStringList::Iterator it = mData->emails.find( email );
  if ( it == mData->emails.end() ) return;
  mData->emails.remove( it );
 }
 QString Addressee::preferredEmail() const
 {
  if ( mData->emails.count() == 0 ) return QString::null;
  else return mData->emails.first();
 }
 QStringList Addressee::emails() const
 {
  return mData->emails;
 }
 void Addressee::setEmails( const QStringList& emails ) {
    detach();
    mData->emails = emails;
 }
 void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber )
 {
  detach();
  mData->empty = false;
  PhoneNumber::List::Iterator it;
  for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
    if ( (*it).id() == phoneNumber.id() ) {
      *it = phoneNumber;
      return;
    }
  }
  mData->phoneNumbers.append( phoneNumber );
 }
 void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber )
 {
  detach();
  PhoneNumber::List::Iterator it;
  for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
    if ( (*it).id() == phoneNumber.id() ) {
      mData->phoneNumbers.remove( it );
      return;
    }
  }
 }
 PhoneNumber Addressee::phoneNumber( int type ) const
 {
  PhoneNumber phoneNumber( "", type );
  PhoneNumber::List::ConstIterator it;
  for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
-    if ( matchBinaryPattern( (*it).type(), type ) ) {
+    if ( matchBinaryPatternP( (*it).type(), type ) ) {
      if ( (*it).type() & PhoneNumber::Pref )
        return (*it);
      else if ( phoneNumber.number().isEmpty() )
        phoneNumber = (*it);
    }
  }
  return phoneNumber;
 }
 PhoneNumber::List Addressee::phoneNumbers() const
 {
  return mData->phoneNumbers;
 }
 PhoneNumber::List Addressee::phoneNumbers( int type ) const
 {
  PhoneNumber::List list;
  PhoneNumber::List::ConstIterator it;
  for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
    if ( matchBinaryPattern( (*it).type(), type ) ) {
      list.append( *it );
    }
  }
  return list;
 }
 PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
 {
  PhoneNumber::List::ConstIterator it;
  for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
    if ( (*it).id() == id ) {
      return *it;
    }
  }
  return PhoneNumber();
 }
 void Addressee::insertKey( const Key &key )
 {
  detach();
  mData->empty = false;
  Key::List::Iterator it;
  for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
    if ( (*it).id() == key.id() ) {
      *it = key;
      return;
    }
  }
  mData->keys.append( key );
 }
 void Addressee::removeKey( const Key &key )
 {
  detach();
  Key::List::Iterator it;
  for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
    if ( (*it).id() == key.id() ) {
      mData->keys.remove( key );
      return;
    }
  }
 }
 Key Addressee::key( int type, QString customTypeString ) const
 {
  Key::List::ConstIterator it;
  for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
    if ( (*it).type() == type ) {
      if ( type == Key::Custom ) {
        if ( customTypeString.isEmpty() ) {
          return *it;
        } else {
          if ( (*it).customTypeString() == customTypeString )
            return (*it);
        }
      } else {
        return *it;
      }
    }
  }
  return Key( QString(), type );
 }
 void Addressee::setKeys( const Key::List& list ) {
    detach();
    mData->keys = list;
 }
 Key::List Addressee::keys() const
 {
  return mData->keys;
 }
 Key::List Addressee::keys( int type, QString customTypeString ) const
 {
  Key::List list;
  Key::List::ConstIterator it;
  for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
    if ( (*it).type() == type ) {
      if ( type == Key::Custom ) {
        if ( customTypeString.isEmpty() ) {
          list.append(*it);
        } else {
          if ( (*it).customTypeString() == customTypeString )
            list.append(*it);
        }
      } else {
        list.append(*it);
      }
    }
  }
  return list;
 }
 Key Addressee::findKey( const QString &id ) const
 {
  Key::List::ConstIterator it;
  for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
    if ( (*it).id() == id ) {
      return *it;
    }
  }
  return Key();
 }
 QString Addressee::asString() const
 {
  return "Smith, agent Smith...";
 }
 void Addressee::dump() const
 {
    return;
  kdDebug(5700) << "Addressee {" << endl;
  kdDebug(5700) << "  Uid: '" << uid() << "'" << endl;
  kdDebug(5700) << "  Name: '" << name() << "'" << endl;
  kdDebug(5700) << "  FormattedName: '" << formattedName() << "'" << endl;
  kdDebug(5700) << "  FamilyName: '" << familyName() << "'" << endl;
  kdDebug(5700) << "  GivenName: '" << givenName() << "'" << endl;
  kdDebug(5700) << "  AdditionalName: '" << additionalName() << "'" << endl;
  kdDebug(5700) << "  Prefix: '" << prefix() << "'" << endl;
  kdDebug(5700) << "  Suffix: '" << suffix() << "'" << endl;
  kdDebug(5700) << "  NickName: '" << nickName() << "'" << endl;
  kdDebug(5700) << "  Birthday: '" << birthday().toString() << "'" << endl;
  kdDebug(5700) << "  Mailer: '" << mailer() << "'" << endl;
  kdDebug(5700) << "  TimeZone: '" << timeZone().asString() << "'" << endl;
  kdDebug(5700) << "  Geo: '" << geo().asString() << "'" << endl;
  kdDebug(5700) << "  Title: '" << title() << "'" << endl;
  kdDebug(5700) << "  Role: '" << role() << "'" << endl;
  kdDebug(5700) << "  Organization: '" << organization() << "'" << endl;
  kdDebug(5700) << "  Note: '" << note() << "'" << endl;
  kdDebug(5700) << "  ProductId: '" << productId() << "'" << endl;
  kdDebug(5700) << "  Revision: '" << revision().toString() << "'" << endl;
  kdDebug(5700) << "  SortString: '" << sortString() << "'" << endl;
  kdDebug(5700) << "  Url: '" << url().url() << "'" << endl;
  kdDebug(5700) << "  Secrecy: '" << secrecy().asString() << "'" << endl;
  kdDebug(5700) << "  Logo: '" << logo().asString() << "'" << endl;
  kdDebug(5700) << "  Photo: '" << photo().asString() << "'" << endl;
  kdDebug(5700) << "  Sound: '" << sound().asString() << "'" << endl;
  kdDebug(5700) << "  Agent: '" << agent().asString() << "'" << endl;
  kdDebug(5700) << "  Emails {" << endl;
  QStringList e = emails();
  QStringList::ConstIterator it;
  for( it = e.begin(); it != e.end(); ++it ) {
    kdDebug(5700) << "    " << (*it) << endl;
  }
  kdDebug(5700) << "  }" << endl;
  kdDebug(5700) << "  PhoneNumbers {" << endl;
  PhoneNumber::List p = phoneNumbers();
  PhoneNumber::List::ConstIterator it2;
  for( it2 = p.begin(); it2 != p.end(); ++it2 ) {
    kdDebug(5700) << "    Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl;
  }
  kdDebug(5700) << "  }" << endl;
  Address::List a = addresses();
  Address::List::ConstIterator it3;
  for( it3 = a.begin(); it3 != a.end(); ++it3 ) {
    (*it3).dump();
  }
  kdDebug(5700) << "  Keys {" << endl;
  Key::List k = keys();
  Key::List::ConstIterator it4;
  for( it4 = k.begin(); it4 != k.end(); ++it4 ) {
    kdDebug(5700) << "    Type: " << int((*it4).type()) <<
                     " Key: " << (*it4).textData() <<
                     " CustomString: " << (*it4).customTypeString() << endl;
  }
  kdDebug(5700) << "  }" << endl;
  kdDebug(5700) << "}" << endl;
 }
 void Addressee::insertAddress( const Address &address )
 {
  detach();
  mData->empty = false;
  Address::List::Iterator it;
  for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
    if ( (*it).id() == address.id() ) {
      *it = address;
      return;
    }
  }
  mData->addresses.append( address );
 }
 void Addressee::removeAddress( const Address &address )
 {
  detach();
  Address::List::Iterator it;
  for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
    if ( (*it).id() == address.id() ) {
      mData->addresses.remove( it );
      return;
    }
  }
 }
 Address Addressee::address( int type ) const
 {
  Address address( type );
  Address::List::ConstIterator it;
  for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
-    if ( matchBinaryPattern( (*it).type(), type ) ) {
+    if ( matchBinaryPatternA( (*it).type(), type ) ) {
      if ( (*it).type() & Address::Pref )
        return (*it);
      else if ( address.isEmpty() )
        address = (*it);
    }
  }
  return address;
 }
 Address::List Addressee::addresses() const
 {
  return mData->addresses;
 }
 Address::List Addressee::addresses( int type ) const
 {
  Address::List list;
  Address::List::ConstIterator it;
  for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
    if ( matchBinaryPattern( (*it).type(), type ) ) {
      list.append( *it );
    }
  }
  return list;
 }
 Address Addressee::findAddress( const QString &id ) const
 {
  Address::List::ConstIterator it;
  for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
    if ( (*it).id() == id ) {
      return *it;
    }
  }
  return Address();
 }
 void Addressee::insertCategory( const QString &c )
 {
  detach();
  mData->empty = false;
  if ( mData->categories.contains( c ) ) return;
  mData->categories.append( c );
 }
 void Addressee::removeCategory( const QString &c )
 {
  detach();
  QStringList::Iterator it = mData->categories.find( c );
  if ( it == mData->categories.end() ) return;
  mData->categories.remove( it );
 }
 bool Addressee::hasCategory( const QString &c ) const
 {
  return ( mData->categories.contains( c ) );
 }
 void Addressee::setCategories( const QStringList &c )
 {
  detach();
  mData->empty = false;
  mData->categories = c;
 }
 QStringList Addressee::categories() const
 {
  return mData->categories;
 }
 void Addressee::insertCustom( const QString &app, const QString &name,
                              const QString &value )
 {
  if ( value.isNull() || name.isEmpty() || app.isEmpty() ) return;
  detach();
  mData->empty = false;
  QString qualifiedName = app + "-" + name + ":";
  QStringList::Iterator it;
  for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
    if ( (*it).startsWith( qualifiedName ) ) {
      (*it) = qualifiedName + value; 
      return;
    }
  }
  mData->custom.append( qualifiedName + value );
 }
 void Addressee::removeCustom( const QString &app, const QString &name)
 {
  detach();
  QString qualifiedName = app + "-" + name + ":";
  QStringList::Iterator it;
  for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
    if ( (*it).startsWith( qualifiedName ) ) {
      mData->custom.remove( it );
      return;
    }
  }
 }
 QString Addressee::custom( const QString &app, const QString &name ) const
 {
  QString qualifiedName = app + "-" + name + ":";
  QString value;
  QStringList::ConstIterator it;
  for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
    if ( (*it).startsWith( qualifiedName ) ) {
      value = (*it).mid( (*it).find( ":" ) + 1 );
      break;
    }
  }
  return value;
 }
@@ -1710,142 +1712,158 @@ void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
      fullName = rawEmail.left(startPos).stripWhiteSpace();
      // grab the email part
      email = rawEmail.mid(startPos+1, endPos-startPos-1).stripWhiteSpace();
      // Check that we do not have any extra characters on the end of the
      // strings
      len = fullName.length();
      if (fullName[0]=='"' && fullName[len-1]=='"')
        fullName = fullName.mid(1, len-2);
      else if (fullName[0]=='<' && fullName[len-1]=='>')
        fullName = fullName.mid(1, len-2);
      else if (fullName[0]=='(' && fullName[len-1]==')')
        fullName = fullName.mid(1, len-2);
    }
  }
 }
 void Addressee::setResource( Resource *resource )
 {
    detach();
    mData->resource = resource;
 }
 Resource *Addressee::resource() const
 {
    return mData->resource;
 }
 //US
 QString Addressee::resourceLabel()
 {
  return i18n("Resource");
 }
 void Addressee::setChanged( bool value )
 {
    detach();
    mData->changed = value;
 }
 bool Addressee::changed() const
 {
    return mData->changed;
 }
 QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
 {
  if (!a.mData) return s;
  s << a.uid(); 
  s << a.mData->name;
  s << a.mData->formattedName;
  s << a.mData->familyName;
  s << a.mData->givenName;
  s << a.mData->additionalName;
  s << a.mData->prefix;
  s << a.mData->suffix;
  s << a.mData->nickName;
  s << a.mData->birthday;
  s << a.mData->mailer;
  s << a.mData->timeZone;
  s << a.mData->geo;
  s << a.mData->title;
  s << a.mData->role;
  s << a.mData->organization;
  s << a.mData->note;
  s << a.mData->productId;
  s << a.mData->revision;
  s << a.mData->sortString;
  s << a.mData->url;
  s << a.mData->secrecy;
  s << a.mData->logo;
  s << a.mData->photo;
  s << a.mData->sound;
  s << a.mData->agent;
  s << a.mData->phoneNumbers;
  s << a.mData->addresses;
  s << a.mData->emails;
  s << a.mData->categories;
  s << a.mData->custom;
  s << a.mData->keys;
  return s;
 }
 QDataStream &KABC::operator>>( QDataStream &s, Addressee &a )
 {
  if (!a.mData) return s;
  s >> a.mData->uid;
  s >> a.mData->name;
  s >> a.mData->formattedName;
  s >> a.mData->familyName;
  s >> a.mData->givenName;
  s >> a.mData->additionalName;
  s >> a.mData->prefix;
  s >> a.mData->suffix;
  s >> a.mData->nickName;
  s >> a.mData->birthday;
  s >> a.mData->mailer;
  s >> a.mData->timeZone;
  s >> a.mData->geo;
  s >> a.mData->title;
  s >> a.mData->role;
  s >> a.mData->organization;
  s >> a.mData->note;
  s >> a.mData->productId;
  s >> a.mData->revision;
  s >> a.mData->sortString;
  s >> a.mData->url;
  s >> a.mData->secrecy;
  s >> a.mData->logo;
  s >> a.mData->photo;
  s >> a.mData->sound;
  s >> a.mData->agent;
  s >> a.mData->phoneNumbers;
  s >> a.mData->addresses;
  s >> a.mData->emails;
  s >> a.mData->categories;
  s >> a.mData->custom;
  s >> a.mData->keys;
  a.mData->empty = false;
  return s;
 }
 bool matchBinaryPattern( int value, int pattern )
 {
  /**
    We want to match all telephonnumbers/addresses which have the bits in the
    pattern set. More are allowed.
    if pattern == 0 we have a special handling, then we want only those with
    exactly no bit set.
   */
  if ( pattern == 0 )
    return ( value == 0 );
  else
    return ( pattern == ( pattern & value ) );
 }
+bool matchBinaryPatternP( int value, int pattern )
+{
+  
+  if ( pattern == 0 )
+    return ( value == 0 );
+  else
+      return ( (pattern |PhoneNumber::Pref ) == ( value |PhoneNumber::Pref ) );
+}
+bool matchBinaryPatternA( int value, int pattern )
+{
+ 
+  if ( pattern == 0 )
+    return ( value == 0 );
+  else
+      return ( (pattern | Address::Pref) == ( value | Address::Pref ) );
+}
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index bba5f9a..48d3985 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -4,434 +4,397 @@
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <sl/slzdb.h>
 #include <libkdepim/ksyncprofile.h>
 #include "resourcesharpdtmconfig.h"
 #include "resourcesharpdtm.h"
 #include "syncprefwidget.h"
 #include "stdaddressbook.h"
 #include "sharpdtmconverter.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
 {
  void *init_microkabc_sharpdtm()
  {
    return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidgetContainer>();
  }
 }
 ResourceSharpDTM::ResourceSharpDTM( const KConfig *config, bool syncable  )
  : Resource( config, syncable ), mConverter (0)
 {
  // we can not choose the filename. Therefore use the default to display
  QString fileName = SlZDataBase::addressbookFileName();
  init( fileName );
 }
 ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable  )
  : Resource( 0, syncable )
 {
  init( fileName );
 }
 void ResourceSharpDTM::init( const QString &fileName )
 {
  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
  setFileName( fileName );
 }
 ResourceSharpDTM::~ResourceSharpDTM()
 {
  if (mConverter != 0)
    delete mConverter;
  if(mAccess != 0)
    delete mAccess;
 }
 void ResourceSharpDTM::writeConfig( KConfig *config )
 {
  Resource::writeConfig( config );
 }
 Ticket *ResourceSharpDTM::requestSaveTicket()
 {
 
  qDebug("ResourceSharpDTM::requestSaveTicket: %s", fileName().latin1());
  if ( !addressBook() ) return 0;
 #ifdef ALLOW_LOCKING
  if ( !lock( fileName() ) ) {
      qDebug("ResourceSharpDTM::requestSaveTicket(): Unable to lock file ");
    return 0;
  }
 #endif
  return createTicket( this );
 }
 bool ResourceSharpDTM::doOpen()
 {
  qDebug("ResourceSharpDTM::doOpen: %s", fileName().latin1());
  // the last parameter in the SlZDataBase constructor means "readonly"
  mAccess = new SlZDataBase(fileName(),
                        SlZDataBase::addressbookItems(),
-                        NULL, true);
+                        NULL, false);
  if ( !mAccess ) {
    qDebug("Unable to load file() %s", fileName().latin1());
    return false;
  }
  if (mConverter == 0)
  {
    mConverter = new SharpDTMConverter();
-    bool res = mConverter->init();
+    bool res = mConverter->init(); 
    if ( !res )
    {
          QString msg("Unable to initialize sharp converter. Most likely a problem with the category file");
      qDebug(msg);
      delete mAccess;
      mAccess = 0;
      return false;
    }
  }
 return true;
 }
 void ResourceSharpDTM::doClose()
 {
  qDebug("ResourceSharpDTM::doClose: %s", fileName().latin1());
  if(mAccess)
  {
    delete mAccess;
    mAccess = 0;
  }
  // it seems so, that deletion of access deletes backend as well
  //delete backend;
  return;
 }
 bool ResourceSharpDTM::load()
 {
  qDebug("ResourceSharpDTM::load: %s", fileName().latin1());
  bool res = false;
  CardId id;
  for (bool res=mAccess->first(); res == true; res=mAccess->next())
  {
    id = mAccess->cardId();
    KABC::Addressee addressee;
    res = mConverter->sharpToAddressee( id, mAccess, addressee );
    if ( !addressee.isEmpty() && res )
    {
      addressee.setResource( this );
      addressBook()->insertAddressee( addressee );
    }
  }
  return true;
 }
 bool ResourceSharpDTM::save( Ticket *ticket )
 {
  qDebug("ResourceSharpDTM::save: %s", fileName().latin1());
  mDirWatch.stopScan();
  KABC::AddressBook::Iterator it;
  bool res;
  KABC::Addressee::List changedAddressees;
  for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
      if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
          QString uid = (*it).originalExternalUID();
          CardId id ;
          bool res;
          if ( uid.isEmpty() )
              id = 0;
          else
              id = uid.toUInt();
          KABC::Addressee addressee = (*it);
          if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) {
              res = mAccess->startEditCard(id);
              if (res == true)
                  {
                      res = mConverter->addresseeToSharp( (*it), mAccess, id  );
                      if (res == true)
                          {
                              KABC::Addressee addressee;
-                              qDebug("1NEW id is %d", id);
                              res = mConverter->sharpToAddressee( id, mAccess, addressee );
                              addressee.setUid((*it).uid() );
-                              addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
+                              addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
-                              changedAddressees.append( addressee );
                              res = mAccess->finishEditCard(&id);
-                              qDebug("2NEW id is %d", id);
+                              //qDebug("2NEW id is %d", id);
+                              addressee.setExternalUID( QString::number( id ) );
+                              addressee.setOriginalExternalUID( QString::number( id ) ); 
+                              changedAddressees.append( addressee );
                              
                              if (res == false)
                                  qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
-                              else {
+                             
-                                  qDebug("added card success ");
-                              }
                          }
                      else
                          {
                              qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1());
                              mAccess->cancelEditCard();
                          }
                  }
          } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
              res = mAccess->deleteCard(&id);
              if ( res ) 
                  qDebug("delete success ");
              else
                  qDebug("delete error ");
          } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
              //changed
+              qDebug("changed ****");
              res = mAccess->startEditCard(id);
              if (res == true)
                  {
                      res = mConverter->addresseeToSharp( (*it), mAccess, id  );
                      if (res == true)
                          {
                              KABC::Addressee addressee;
                              res = mConverter->sharpToAddressee( id, mAccess, addressee );
                              addressee.setUid((*it).uid() );
                              addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
                              changedAddressees.append( addressee );
                              res = mAccess->finishEditCard(&id);
                              if (res == false)
                                  qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
-                              else {
+                              
-                                  qDebug("change card succes ");
-                              }
                          }
                      else
                          {
                              qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1());
                              mAccess->cancelEditCard();
                          }
                  }
          }
-      }
-#if 0 
-      // old code
-            CardId id = 0;// 0 means new card
-    KABC::Addressee addressee = (*it);
-    res = mAccess->startEditCard(id);
-    if (res == true)
-    {
-      res = mConverter->addresseeToSharp( *it, mAccess, id  );
-      if (res == true)
-      {
-        res = mAccess->finishEditCard(&id);
-        if (res == false)
-          qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
      }
-      else
-      {
-        qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1());
-        mAccess->cancelEditCard();
-      }
-    }
-    else
-    {
-      qDebug("Unable to add new card. Addressee: %s", addressee.formattedName().latin1());
-    }
-#endif
  }
  KABC::Addressee::List::Iterator it2;
  for ( it2 = changedAddressees.begin(); it2 != changedAddressees.end(); ++it2 )
      addressBook()->insertAddressee((*it2));
  //US  mAccess->save();
  mDirWatch.startScan();
  delete ticket;
  unlock( fileName() );
  return true;
 }
 bool ResourceSharpDTM::lock( const QString &lockfileName )
 {
 #ifdef ALLOW_LOCKING
  qDebug("ResourceSharpDTM::lock: %s", fileName().latin1());
  kdDebug(5700) << "ResourceSharpDTM::lock()" << endl;
  QString fn = lockfileName;
  KURL url(fn);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  kdDebug(5700) << "-- lock name: " << lockName << endl;
  if (QFile::exists( lockName ))
  {
    qDebug("ResourceSharpDTM::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName());
    return false;
  }
  QString lockUniqueName;
  lockUniqueName = fn + KApplication::randomString( 8 );
  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
  mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
  kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
  // Create unique file
  QFile file( mLockUniqueName );
  file.open( IO_WriteOnly );
  file.close();
  // Create lock file
  int result = 0;
 #ifndef _WIN32_
  result = ::link( QFile::encodeName( mLockUniqueName ),
                       QFile::encodeName( lockName ) );
 #endif
  if ( result == 0 ) {
    addressBook()->emitAddressBookLocked();
    return true;
  }
  // TODO: check stat
  return false;
 #else
  return true;
 #endif 
 }
 void ResourceSharpDTM::unlock( const QString &fileName )
 {
 #ifdef ALLOW_LOCKING
  qDebug("ResourceSharpDTM::unlock() %s", fileName.latin1());
  QString fn = fileName;
  KURL url(fn);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  QFile::remove( lockName );
  QFile::remove( mLockUniqueName );
  addressBook()->emitAddressBookUnlocked();
 #endif 
 }
 void ResourceSharpDTM::setFileName( const QString &newFileName )
 {
  mDirWatch.stopScan();
  mDirWatch.removeFile( fileName() );
  Resource::setFileName( newFileName );
  mDirWatch.addFile( fileName() );
  mDirWatch.startScan();
 }
 void ResourceSharpDTM::fileChanged()
 {
  // There is a small theoretical chance that KDirWatch calls us before
  // we are fully constructed
  if (!addressBook())
    return;
  QString text( i18n( "Sharp DTM resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
    load();
    addressBook()->emitAddressBookChanged();
  }
 }
 void ResourceSharpDTM::removeAddressee( const Addressee &addr )
 {
 }
 void ResourceSharpDTM::cleanUp()
 {
  unlock( fileName() );
 }
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
@@ -1,390 +1,431 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 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)
 {
 }
 SharpDTMConverter::~SharpDTMConverter()
 {
  deinit();
 }
 bool SharpDTMConverter::init()
 {
  catDB = new SlCategory::SlCategories();
  if (!catDB)
    return false;
 //  catDB->load( categoryFileName() );
  return true;
 }
 void SharpDTMConverter::deinit()
 {
  if (catDB)
  {
    delete catDB;
    catDB = 0;
  }
 }
 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!!");
+    //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!");
-    addr.setFormattedName(db->readField(ZdbAdrs::FileAs));
+    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());
+    emailstr.replace( QRegExp(","), " " ); 
-    QStringList emails = QStringList::split(",", emailstr);
+    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 ( ! found )
-    if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty())
+        if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty())
-      addr.insertEmail(db->readField(ZdbAdrs::DefaultEmail), true);
+            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()))
    {
      Address homeaddress;
      homeaddress.setType(Address::Home);
 //US    homeaddress.setPostOfficeBox( "" );
 //US    homeaddress.setExtended( "" );
      homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet) );
      homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) );
      homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) );
      homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) );
      homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) );
      addr.insertAddress( homeaddress );
    }
    if (!db->readField(ZdbAdrs::HomePhone).isEmpty())
    {
      PhoneNumber homephone;
      homephone.setType( PhoneNumber::Home );
      homephone.setNumber( db->readField(ZdbAdrs::HomePhone) );
      addr.insertPhoneNumber( homephone );
    }
    if (!db->readField(ZdbAdrs::HomeFax).isEmpty())
    {
      PhoneNumber homefax;
      homefax.setType( PhoneNumber::Home | PhoneNumber::Fax );
      homefax.setNumber( db->readField(ZdbAdrs::HomeFax) );
      addr.insertPhoneNumber( homefax );
    }
    if (!db->readField(ZdbAdrs::HomeMobile).isEmpty())
    {
      PhoneNumber homemobile;
      homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
      homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) );
      addr.insertPhoneNumber( homemobile );
    }
    addr.setUrl( db->readField(ZdbAdrs::HomeWebPage) );
    // business
    if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) ||
        (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) ||
        (!db->readField(ZdbAdrs::BusinessState).isEmpty()) ||
        (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) ||
        (!db->readField(ZdbAdrs::BusinessCountry).isEmpty()))
    {
      Address businessaddress;
      businessaddress.setType(Address::Work);
 //US    businessaddress.setPostOfficeBox( "" );
 //US    businessaddress.setExtended( "" );
      businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet) );
      businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) );
      businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) );
      businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) );
      businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) );
      addr.insertAddress( businessaddress );
    }
    if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty())
    {
      PhoneNumber businessphone;
      businessphone.setType( PhoneNumber::Work );
      businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) );
      addr.insertPhoneNumber( businessphone );
    }
    if (!db->readField(ZdbAdrs::BusinessFax).isEmpty())
    {
      PhoneNumber businessfax;
      businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax );
      businessfax.setNumber( db->readField(ZdbAdrs::BusinessFax) );
      addr.insertPhoneNumber( businessfax );
    }
    if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty())
    {
      PhoneNumber businessmobile;
      businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell );
      businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) );
      addr.insertPhoneNumber( businessmobile );
    }
    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 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: 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("qtopiaToAddressee annyversary found:%s", dt.latin1());
-//      qDebug("QtopiaConverter::qtopiaToAddressee 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 check which seperator we need here for the emails!!");
-    qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee");
+    //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee");
-    QString emails = addr.emails().join(",");
+    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()) {
      database->writeField(ZdbAdrs::HomeStreet, homeaddress.street());
      database->writeField(ZdbAdrs::HomeCity, homeaddress.locality());
      database->writeField(ZdbAdrs::HomeState, homeaddress.region());
      database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode());
      database->writeField(ZdbAdrs::HomeCountry, homeaddress.country());
    }
    PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home );
    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());
      database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality());
      database->writeField(ZdbAdrs::BusinessState, businessaddress.region());
      database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode());
      database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country());
    }
    PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work );
    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())
+    if (!businessmobile.number().isEmpty()) {
-      database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number());
+        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());
    database->writeField(ZdbAdrs::Profession, addr.custom( "KADDRESSBOOK", "X-Profession" ));
    database->writeField(ZdbAdrs::Assistant, addr.custom( "KADDRESSBOOK", "X-AssistantsName" ));
    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 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: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?");
-        qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee");
+        //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee");
-    if (gt = "male")
+    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" ));
+    dt = addr.birthday().date();
-    database->writeField(ZdbAdrs::Birthday, 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 ();
+}
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.h b/kabc/plugins/sharpdtm/sharpdtmconverter.h
index 99e0413..a04083e 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.h
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.h
@@ -1,86 +1,87 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KABC_SHARPDTMCONVERTER_H
 #define KABC_SHARPDTMCONVERTER_H
 #include <qstring.h>
 #include <sl/slzdb.h>
 #include "addressee.h"
 namespace SlCategory {
  class SlCategories;
 }
 class SlZDataBase;
 namespace KABC {
 class SharpDTMConverter
 {
 public:
  /**
   * Constructor.
   */
  SharpDTMConverter();
  /**
   * Destructor.
   */
  virtual ~SharpDTMConverter();
  bool init();
  void deinit();
  /**
   * Converts a given sharp card to an addressee.
   *
   * @param contact The sharp card id, eventhough it might be 0, if the contact is a new one.
   * @param database The sharp database pointer we use for the conversion
   * @param addr    The addressee.
   */
  bool sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr );
  /**
   * Converts an addressee to a sharp dtm contact.
   *
   * @param addr    The addressee.
   * @param database The sharp database pointer we use for the conversion
   * @param contact The sharp card id, eventhough it might be 0, if the contact is a new one.
   */
  bool addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact );
  private:
    SlCategory::SlCategories* catDB;
+    QDate convertDate( QString );
 };
 }
 #endif
diff --git a/version b/version
index 8ddae61..006e0aa 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.5b";
+version = "1.9.5c";