support for export of categories und supression of empty fields

4 files changed, 77 insertions, 20 deletions

diff --git a/kabc/converter/opie/opieconverter.cpp b/kabc/converter/opie/opieconverter.cpp
index d785fbc..b4e9f1c 100644
--- a/kabc/converter/opie/opieconverter.cpp
+++ b/kabc/converter/opie/opieconverter.cpp
@@ -1,338 +1,375 @@
 /*
     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$
 */
 
 //US
 #include "kglobal.h"
 
 
 #include "opieconverter.h"
 
 #include <qpe/categories.h>
+#include <qpe/categoryselect.h>
 
 
 using namespace KABC;
 
-OpieConverter::OpieConverter()
+OpieConverter::OpieConverter() : catDB(0)
 {
 }
 
 OpieConverter::~OpieConverter()
 {
+  deinit();
+}
+
+bool OpieConverter::init()
+{
+  catDB = new Categories();
+  if (catDB) 
+  {
+    catDB->load( categoryFileName() );
+    return true;
+  }
+  else 
+  {
+    return false;
+  }
+
+}
+
+void OpieConverter::deinit()
+{
+  if (catDB) 
+  {
+    delete catDB;
+    catDB = 0;
+  }
 }
   
 bool OpieConverter::opieToAddressee( OContact &contact, Addressee &addr )
 {
     // name
     addr.setFormattedName(contact.fileAs());
     addr.setFamilyName( contact.lastName() );
     addr.setGivenName( contact.firstName() );
     addr.setAdditionalName( contact.middleName() );
     addr.setPrefix( contact.title() );
     addr.setSuffix( contact.suffix() );
   
     
     // email
     QStringList emails = contact.emailList();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       addr.insertEmail( *it, ((*it) == contact.defaultEmail()) );
     }
 
+    if (!contact.defaultEmail().isEmpty()) 
     addr.insertEmail(contact.defaultEmail(), true);
     
     // home
+    if ((!contact.homeStreet().isEmpty()) ||
+        (!contact.homeCity().isEmpty()) ||
+        (!contact.homeState().isEmpty()) ||
+        (!contact.homeZip().isEmpty()) ||
+        (!contact.homeCountry().isEmpty()))
+    {
     Address homeaddress;
     homeaddress.setType(Address::Home);
 //US    homeaddress.setPostOfficeBox( "" );
 //US    homeaddress.setExtended( "" );
     homeaddress.setStreet( contact.homeStreet() );
     homeaddress.setLocality( contact.homeCity() );
     homeaddress.setRegion( contact.homeState() );
     homeaddress.setPostalCode( contact.homeZip() );
     homeaddress.setCountry( contact.homeCountry() );
     
     addr.insertAddress( homeaddress );
+    }
     
     if (!contact.homePhone().isEmpty())
     {
       PhoneNumber homephone;
       homephone.setType( PhoneNumber::Home );
       homephone.setNumber( contact.homePhone() );
       addr.insertPhoneNumber( homephone );
     }
     
     if (!contact.homeFax().isEmpty())
     {
       PhoneNumber homefax;
       homefax.setType( PhoneNumber::Home | PhoneNumber::Fax );
       homefax.setNumber( contact.homeFax() );
       addr.insertPhoneNumber( homefax );
     }
     
     if (!contact.homeMobile().isEmpty())
     {
       PhoneNumber homemobile;
       homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
       homemobile.setNumber( contact.homeMobile() );
       addr.insertPhoneNumber( homemobile );
     }
     
     addr.setUrl( contact.homeWebpage() );
                 
 
     // business
+    if ((!contact.businessStreet().isEmpty()) ||
+        (!contact.businessCity().isEmpty()) ||
+        (!contact.businessState().isEmpty()) ||
+        (!contact.businessZip().isEmpty()) ||
+        (!contact.businessCountry().isEmpty()))
+    {
     Address businessaddress;
     businessaddress.setType(Address::Work);
 //US    businessaddress.setPostOfficeBox( "" );
 //US    businessaddress.setExtended( "" );
     businessaddress.setStreet( contact.businessStreet() );
     businessaddress.setLocality( contact.businessCity() );
     businessaddress.setRegion( contact.businessState() );
     businessaddress.setPostalCode( contact.businessZip() );
     businessaddress.setCountry( contact.businessCountry() );
     
     addr.insertAddress( businessaddress );
+    }
+    
 
     if (!contact.businessPhone().isEmpty())
     {
       PhoneNumber businessphone;
       businessphone.setType( PhoneNumber::Work );
       businessphone.setNumber( contact.businessPhone() );
       addr.insertPhoneNumber( businessphone );
     }
     
     if (!contact.businessFax().isEmpty())
     {
       PhoneNumber businessfax;
       businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax );
       businessfax.setNumber( contact.businessFax() );
       addr.insertPhoneNumber( businessfax );
     }
     
     if (!contact.businessMobile().isEmpty())
     {
       PhoneNumber businessmobile;
       businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell );
       businessmobile.setNumber( contact.businessMobile() );
       addr.insertPhoneNumber( businessmobile );
     }
 
     if (!contact.businessPager().isEmpty())
     {
       PhoneNumber businesspager;
       businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager );
       businesspager.setNumber( contact.businessPager() );
       addr.insertPhoneNumber( businesspager );
     }
         
     addr.setRole( contact.jobTitle() ); //?
     addr.setOrganization( contact.company() );
     addr.insertCustom( "KADDRESSBOOK", "X-Profession", contact.profession() );
     addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", contact.assistant() );
     addr.insertCustom( "KADDRESSBOOK", "X-Department", contact.department() );
     addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", contact.manager() );
     addr.insertCustom( "KADDRESSBOOK", "X-Office", contact.office() );
 
     //personal
     addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", contact.spouse() );
     addr.insertCustom( "KADDRESSBOOK", "X-Gender", contact.gender() );
     
     if (contact.anniversary().isValid()) {
-      int orgformat = KGlobal::locale()->getIntDateFormat();
-      KGlobal::locale()->setIntDateFormat( 2 ); // = Qt::ISODate
-      QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true);
+      QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate);
 //US      
       qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1());
-      KGlobal::locale()->setIntDateFormat(orgformat );
       addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
     }
     
     addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() );
     if (contact.birthday().isValid())
       addr.setBirthday( contact.birthday() );
      
     addr.setNickName( contact.nickname() );
 
     // others
     //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available.
     QString notes = contact.notes();
     notes += "\nBusinessWebPage: " + contact.businessWebpage() + "\n";
         
     addr.setNote( contact.notes() );
 
     
         
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
     
     QStringList cats = contact.categoryNames("Contacts");
-    for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
-      qDebug("Cat: %s", (*it).latin1());
-    }
+//    for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
+//      qDebug("Cat: %s", (*it).latin1());
+//    }
 
         
     addr.setCategories( contact.categoryNames("Contacts") );
 //    qDebug("Groups: %s", contact.groups().latin1());
 //    addr.setCategories( contact.groupList() );
 
 
     return true;
 }
 
 bool OpieConverter::addresseeToOpie( const Addressee &addr, OContact &contact )
 {
     // name
     contact.setLastName(addr.familyName());
     contact.setFirstName(addr.givenName());
     contact.setMiddleName(addr.additionalName());
     contact.setTitle(addr.prefix());
     contact.setSuffix(addr.suffix());
     contact.setFileAs();
     
     
     // email
     QStringList emails = addr.emails();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       contact.insertEmail(*it);
     }
     contact.setDefaultEmail( addr.preferredEmail() );
     
 
     // home
     const Address homeaddress = addr.address(Address::Home);
     if (!homeaddress.isEmpty()) {
       contact.setHomeStreet(homeaddress.street());
       contact.setHomeCity(homeaddress.locality());
       contact.setHomeState(homeaddress.region());
       contact.setHomeZip(homeaddress.postalCode());
       contact.setHomeCountry(homeaddress.country());
     }
 
     PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home );
     if (!homephone.number().isEmpty())
       contact.setHomePhone(homephone.number());
     
     PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax );
     if (!homefax.number().isEmpty())
       contact.setHomeFax(homefax.number());
     
     PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell );
     if (!homemobile.number().isEmpty())
       contact.setHomeMobile(homemobile.number());
     
     contact.setHomeWebpage(addr.url().url());
                 
 
     // business
     const Address businessaddress = addr.address(Address::Work);
     if (!businessaddress.isEmpty()) {
       contact.setBusinessStreet(businessaddress.street());
       contact.setBusinessCity(businessaddress.locality());
       contact.setBusinessState(businessaddress.region());
       contact.setBusinessZip(businessaddress.postalCode());
       contact.setBusinessCountry(businessaddress.country());
     }
 
     PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work );
     if (!businessphone.number().isEmpty())
       contact.setBusinessPhone(businessphone.number());
     
     PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax );
     if (!businessfax.number().isEmpty())
       contact.setBusinessFax(businessfax.number());
     
     PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell );
     if (!businessmobile.number().isEmpty())
       contact.setBusinessMobile(businessmobile.number());
         
     PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager );
     if (!businesspager.number().isEmpty())
       contact.setBusinessPager(businesspager.number());
 
     contact.setJobTitle(addr.role());
     contact.setCompany(addr.organization());
 
     contact.setProfession(addr.custom( "KADDRESSBOOK", "X-Profession" ));
     contact.setAssistant(addr.custom( "KADDRESSBOOK", "X-AssistantsName" ));
     contact.setDepartment(addr.custom( "KADDRESSBOOK", "X-Department" ));
     contact.setManager(addr.custom( "KADDRESSBOOK", "X-ManagersName" ));
     contact.setOffice(addr.custom( "KADDRESSBOOK", "X-Office" ));
 
     //personal
     contact.setSpouse(addr.custom( "KADDRESSBOOK", "X-Spouse" ));
     contact.setGender(addr.custom( "KADDRESSBOOK", "X-Gender" ));
     
     QDate dt = KGlobal::locale()->readDate( 
             addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate
     contact.setAnniversary( dt );
     
     contact.setChildren(addr.custom( "KADDRESSBOOK", "X-Children" ));
     
     contact.setBirthday(addr.birthday().date());
     contact.setNickname(addr.nickName());
 
     // other
     contact.setNotes(addr.note());
     
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
 /*US    
     QStringList cats = contact.categoryNames("Contacts");
     for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
       qDebug("Cat: %s", (*it).latin1());
     }
 */    
     
 //    addr.setCategories( contact.categoryNames("Contacts") );
 //    contact.categoryNames("Contacts");
 //    contact.setCategoryNames(addr.categories());
 
 /*US
     QStringList cats = addr.categories();
     QArray<int> cat(cats.count());
     int counter = 0;
     for ( QStringList::ConstIterator it = cats.begin(); it != cats.end(); ++it )
         cat[counter] = (*it).toInt();
 
     contact.setCategories( cat );
 */    
 
     Categories catDB;
-    catDB.dump();
-//US    catDB.load( contact.categoryFileName() );
-    catDB.load( "contact" );
-
+    catDB.load( categoryFileName() );
     QStringList cats = addr.categories();
-    for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
-      qDebug("categories: %s", (*it).latin1());
-//      contact.setCategories(catDB.id(*it));
-    }
     
+    QArray<int> iar;
+    if ( !cats.isEmpty() ) {
+      QArray<int> iar = catDB.ids("contact", cats);
+      contact.setCategories(iar);
+    }
 
     return true;
 }
diff --git a/kabc/converter/opie/opieconverter.h b/kabc/converter/opie/opieconverter.h
index ef7300b..7d2ad85 100644
--- a/kabc/converter/opie/opieconverter.h
+++ b/kabc/converter/opie/opieconverter.h
@@ -1,71 +1,80 @@
 /*
     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_OPIECONVERTER_H
 #define KABC_OPIECONVERTER_H
 
 #include <qstring.h>
 
 #include "addressee.h"
 #include <opie/ocontact.h>
 
+class Categories;
+
 namespace KABC {
 
 class OpieConverter
 {
 public:
 
   /**
    * Constructor.
    */
   OpieConverter();
 
   /**
    * Destructor.
    */
-  ~OpieConverter();
+  virtual ~OpieConverter();
+  
+  virtual bool init();
+  virtual void deinit();
   
   /**
    * Converts a vcard string to an addressee.
    *
    * @param contact The opie contact.
    * @param addr    The addressee.
    */
   bool opieToAddressee( OContact &contact, Addressee &addr );
 
   /**
    * Converts an addressee to a vcard string.
    *
    * @param addr    The addressee.
    * @param contact The opie contact.
    */
   bool addresseeToOpie( const Addressee &addr, OContact &contact );
   
+  private:
+    Categories* catDB;
+  
+    
 };
 
 }
 #endif
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp
index d1def18..8ee0725 100644
--- a/kaddressbook/xxport/opie/opie_xxport.cpp
+++ b/kaddressbook/xxport/opie/opie_xxport.cpp
@@ -14,189 +14,199 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qdir.h>
 
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 
 #include <opie/ocontactaccess.h>
 #include <opie/ocontactaccessbackend_xml.h>
 
 #include "stdaddressbook.h"
 
 /*US
 #include <qfile.h>
 #include <qtextstream.h>
 
 #include <kabc/vcardconverter.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
 */
 
 #include "xxportmanager.h"
 #include "opieconverter.h"
 
 #include "opie_xxport.h"
 
 
 class OpieXXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new OpieXXPort( ab, parent, name );
     }
 };
 
 
 extern "C"
 {
   void *init_kaddrbk_opie_xxport()
   {
     return ( new OpieXXPortFactory() );
   }
 }
 
 
 OpieXXPort::OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import Opie..." ) );
   createExportAction( i18n( "Export Opie..." ) );
 }
 
 bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
 {
   QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
     
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() );
 #endif //KAB_EMBEDDED
   
   if ( fileName.isEmpty() )
     return true;
 
   OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName );
   OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
 	
   if ( !access ) {
     qDebug("Unable to access file() %s", fileName.latin1());
     addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) );
     return false;
   }
 
+  KABC::OpieConverter mConverter;
+  
+  bool res = mConverter.init();
+  if (!res)
+  {
+    QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) );
+    qDebug(text);
+    KMessageBox::error( parentWidget(), text );
+    delete access;
+    return false;  
+  }
+  
   //Now check if the file has already entries, and ask the user if he wants to delete them first.
 	OContactAccess::List contactList = access->allRecords();
   if (contactList.count() > 0)
   {
     QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
     if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
       // Clean the database..
       access->clear();
     }
   }
   
-  KABC::OpieConverter mConverter;
-  bool res;
       
   KABC::Addressee::List::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     OContact c;
     KABC::Addressee addressee = (*it);
     
     res = mConverter.addresseeToOpie( *it, c );
     if (res == true)
     {
       res = access->add(c);
       if (res == false)
         qDebug("Unable to append Contact %s", c.fullName().latin1());
     }
     else
     {
       qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
     }
   }
   
   access->save();
 
   delete access;
 //US the deletion of the access object deletes the backend object as well.
       
   return true;
 }
 
 KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
 {
   KABC::AddresseeList adrlst;
   
   QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
     
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getOpenFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() );
 #endif //KAB_EMBEDDED
   
   if ( fileName.isEmpty() )
     return KABC::AddresseeList();
 
   OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName );
   OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
 	
   if ( !access ) {
     qDebug("Unable to access file() %s", fileName.latin1());
     addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) );
     return KABC::AddresseeList();
   }
 
   access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
   
   KABC::OpieConverter mConverter;
   bool res = false;
 
 	
   OContactAccess::List::Iterator it;
   OContactAccess::List allList = access->allRecords();
   for ( it = allList.begin(); it != allList.end(); ++it )
   {
     OContact c = (*it);
     
     KABC::Addressee addressee;
     
     res = mConverter.opieToAddressee( c, addressee );    
     
     if ( !addressee.isEmpty() && res ) {
       adrlst.append( addressee );
     }
     
 //    qDebug("found %s", c.fullName().latin1());
   }
   
   delete access;
 //US the deletion of the access object deletes the backend object as well.
   
   return adrlst;
   
 }
diff --git a/kaddressbook/xxport/opie/opie_xxportE.pro b/kaddressbook/xxport/opie/opie_xxportE.pro
index a660a48..c373e37 100644
--- a/kaddressbook/xxport/opie/opie_xxportE.pro
+++ b/kaddressbook/xxport/opie/opie_xxportE.pro
@@ -1,27 +1,28 @@
 TEMPLATE = lib
 CONFIG += qt warn_on 
 TARGET = kaddrbk_opie_xxport
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 
 DEFINES += KAB_EMBEDDED
 
-INCLUDEPATH += ../.. ../../..  ../../../kabc ../../../kabc/converter/opie ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. ../../..  ../../../kabc ../../../kabc/converter/opie ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(OPIEDIR)/include
 LIBS += -L$(QPEDIR)/lib
+LIBS += -L$(OPIEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -lopie
 LIBS += -lqpe
 LIBS += -lqte
 LIBS += -lmicrokabc_opieconverter
 
 INTERFACES = \
 
 HEADERS = \
   opie_xxport.h \
 
 SOURCES = \
   opie_xxport.cpp \