Bugfixes..

2 files changed, 18 insertions, 5 deletions

diff --git a/libopie/pim/ocontactaccessbackend_vcard.cpp b/libopie/pim/ocontactaccessbackend_vcard.cpp
index 903c0b7..013f3af 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.cpp
+++ b/libopie/pim/ocontactaccessbackend_vcard.cpp
@@ -1,232 +1,240 @@
 /*
  * VCard Backend for the OPIE-Contact Database.
  *
+ * Copyright (C) 2000 Trolltech AS.  All rights reserved.
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program 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.
  * =====================================================================
  * ToDo:
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.2  2002/11/10 15:41:53  eilers
+ * Bugfixes..
+ *
  * Revision 1.1  2002/11/09 14:34:52  eilers
  * Added VCard Backend.
  *
  */
 #include "ocontactaccessbackend_vcard.h"
 #include "../../library/backend/vobject_p.h"
 #include "../../library/backend/qfiledirect_p.h"
 
 #include <qpe/timeconversion.h>
 
 #include <qfile.h>
 
 OContactAccessBackend_VCard::OContactAccessBackend_VCard ( QString , QString filename = 0l ):
         m_dirty( false ),
         m_file( filename )
-{}
+{
+        load();
+}
 
 
 bool OContactAccessBackend_VCard::load ()
 {   
         m_map.clear();
         m_dirty = false;
         
         VObject* obj = 0l;
         obj = Parse_MIME_FromFileName( QFile::encodeName(m_file).data() );
         if ( !obj )
                 return false;
 
         while ( obj ) {
                 OContact con = parseVObject( obj );
                 /*
                  * if uid is 0 assign a new one
                  * this at least happens on
                  * Nokia6210
                  */
                 if ( con.uid() == 0 ){
                         con.setUid( 1 );
                         qWarning("assigned new uid %d",con.uid() );
                 }
 
                 m_map.insert( con.uid(), con );
                 
                 VObject *t = obj;
                 obj = nextVObjectInList(obj);
                 cleanVObject( t );
         }
 
         return true;
 
 }
 bool OContactAccessBackend_VCard::reload()
 {
         return load();
 }
 bool OContactAccessBackend_VCard::save()
 { 
         if (!m_dirty )
                 return true;
 
         QFileDirect file( m_file );
         if (!file.open(IO_WriteOnly ) )
                 return false;
 
         VObject *obj;
         obj = newVObject( VCCalProp );
         addPropValue( obj, VCVersionProp, "1.0" );
 
         VObject *vo;
         for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
                 vo = createVObject( *it );
-                addVObjectProp( obj, vo );
+                writeVObject( file.directHandle() , vo );
+                cleanVObject( vo );
         }
-        writeVObject( file.directHandle() , obj );
-        cleanVObject( obj );
-        
         cleanStrTbl();
 
         m_dirty = false;
         return true;
         
 
 }
 void OContactAccessBackend_VCard::clear ()
 {
         m_map.clear();
         m_dirty = true; // ??? sure ? (se)
 }
 
 bool OContactAccessBackend_VCard::add ( const OContact& newcontact )
 {
         m_map.insert( newcontact.uid(), newcontact );
         m_dirty = true;
         return true;
 }
 
 bool OContactAccessBackend_VCard::remove ( int uid )
 {
         m_map.remove( uid );
         m_dirty = true;
                 return true;
 }
 
 bool OContactAccessBackend_VCard::replace ( const OContact &contact )
 {
         m_map.replace( contact.uid(), contact );
         m_dirty = true;
         return true;
 }
         
 OContact OContactAccessBackend_VCard::find ( int uid ) const
 {
     return m_map[uid];
 }
 
 QArray<int> OContactAccessBackend_VCard::allRecords() const
 {
         QArray<int> ar( m_map.count() );
         QMap<int, OContact>::ConstIterator it;
         int i = 0;
         for ( it = m_map.begin(); it != m_map.end(); ++it ) {
                 ar[i] = it.key();
                 i++;
         }
         return ar;
 }
 
 // Not implemented
 QArray<int> OContactAccessBackend_VCard::queryByExample ( const OContact&, int )
 {
         QArray<int> ar(0);
         return ar;
 }
 
 // Not implemented
 QArray<int> OContactAccessBackend_VCard::matchRegexp(  const QRegExp&  ) const
 {
         QArray<int> ar(0);
         return ar;
 }
 
 const uint OContactAccessBackend_VCard::querySettings()
 {
         return 0; // No search possible
 }
 
 bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
         return false; // No search possible, therefore all settings invalid ;)
 }
 
+bool OContactAccessBackend_VCard::wasChangedExternally()
+{
+        return false; // Don't expect concurrent access
+}
 
 // *** Private stuff ***
 
 
 OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
         OContact c;
         
         VObjectIterator it;
         initPropIterator( &it, obj );
         while( moreIteration( &it ) ) {
                 VObject *o = nextVObject( &it );
                 QCString name = vObjectName( o );
                 QCString value = vObjectStringZValue( o );
                 if ( name == VCNameProp ) {
                         VObjectIterator nit;
                         initPropIterator( &nit, o );
                         while( moreIteration( &nit ) ) {
                                 VObject *o = nextVObject( &nit );
                                 QCString name = vObjectTypeInfo( o );
                                 QString value = vObjectStringZValue( o );
                                 if ( name == VCNamePrefixesProp )
                                         c.setTitle( value );
                                 else if ( name == VCNameSuffixesProp )
                                         c.setSuffix( value );
                                 else if ( name == VCFamilyNameProp )
                                         c.setLastName( value );
                                 else if ( name == VCGivenNameProp )
                                         c.setFirstName( value );
                                 else if ( name == VCAdditionalNamesProp )
                                         c.setMiddleName( value );
                         }
                 }
                 else if ( name == VCAdrProp ) {
                         bool work = TRUE; // default address is work address
                         QString street;
                         QString city;
                         QString region;
                         QString postal;
                         QString country;
                         
                         VObjectIterator nit;
                         initPropIterator( &nit, o );
                         while( moreIteration( &nit ) ) {
                                 VObject *o = nextVObject( &nit );
                                 QCString name = vObjectName( o );
                                 QString value = vObjectStringZValue( o );
                                 if ( name == VCHomeProp )
                                         work = FALSE;
                                 else if ( name == VCWorkProp )
                                         work = TRUE;
                                 else if ( name == VCStreetAddressProp )
                                         street = value;
                                 else if ( name == VCCityProp )
                                         city = value;
                                 else if ( name == VCRegionProp )
                                         region = value;
                                 else if ( name == VCPostalCodeProp )
                                         postal = value;
                                 else if ( name == VCCountryNameProp )
                                         country = value;
                         }
                         if ( work ) {
                                 c.setBusinessStreet( street );
diff --git a/libopie/pim/ocontactaccessbackend_vcard.h b/libopie/pim/ocontactaccessbackend_vcard.h
index c1422b0..177ec24 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.h
+++ b/libopie/pim/ocontactaccessbackend_vcard.h
@@ -1,65 +1,70 @@
 /*
  * VCard Backend for the OPIE-Contact Database.
  *
+ * Copyright (C) 2000 Trolltech AS.  All rights reserved.
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program 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.
  * =====================================================================
  * ToDo:
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.2  2002/11/10 15:41:53  eilers
+ * Bugfixes..
+ *
  * Revision 1.1  2002/11/09 14:34:52  eilers
  * Added VCard Backend.
  *
  */
 #ifndef __OCONTACTACCESSBACKEND_VCARD_H_
 #define __OCONTACTACCESSBACKEND_VCARD_H_
 
 #include <opie/ocontact.h>
 
 #include "ocontactaccessbackend.h"
 
 class VObject;
 
 class OContactAccessBackend_VCard : public OContactAccessBackend {
  public:
         OContactAccessBackend_VCard ( QString appname, QString filename = 0l );
 
         bool load ();
         bool reload();
         bool save();
         void clear ();
 
         bool add ( const OContact& newcontact );
         bool remove ( int uid );
         bool replace ( const OContact& contact );
         
         OContact find ( int uid ) const;
         QArray<int> allRecords() const;
         QArray<int> queryByExample ( const OContact &query, int settings );
         QArray<int> matchRegexp(  const QRegExp &r ) const;
 
         const uint querySettings();
         bool hasQuerySettings (uint querySettings) const;
+        bool wasChangedExternally();
         
 private:
         OContact parseVObject( VObject* obj );
         VObject* createVObject( const OContact& c );
         QDate convVCardDateToDate( const QString& datestr );
         VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value );
         VObject *safeAddProp( VObject* o, const char* prop);
         
         bool m_dirty : 1;
         QString m_file;
         QMap<int, OContact> m_map;
 };
 
 #endif