Sorting will now work if fullname is identical on some entries

1 files changed, 5 insertions, 2 deletions

diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h
index adc8dc3..ae6ec9e 100644
--- a/libopie/pim/ocontactaccessbackend_xml.h
+++ b/libopie/pim/ocontactaccessbackend_xml.h
@@ -1,67 +1,70 @@
 /*
  * XML Backend for the OPIE-Contact Database.
  *
  * 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: XML-Backend: Automatic reload if something was changed...
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.8  2002/11/14 17:04:24  eilers
+ * Sorting will now work if fullname is identical on some entries
+ *
  * Revision 1.7  2002/11/13 15:02:46  eilers
  * Small Bug in sorted fixed
  *
  * Revision 1.6  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.5  2002/11/01 15:10:42  eilers
  * Added regExp-search in database for all fields in a contact.
  *
  * Revision 1.4  2002/10/16 10:52:40  eilers
  * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
  *
  * Revision 1.3  2002/10/14 16:21:54  eilers
  * Some minor interface updates
  *
  * Revision 1.2  2002/10/07 17:34:24  eilers
  * added OBackendFactory for advanced backend access
  *
  * Revision 1.1  2002/09/27 17:11:44  eilers
  * Added API for accessing the Contact-Database ! It is compiling, but
  * please do not expect that anything is working !
  * I will debug that stuff in the next time ..
  * Please read README_COMPILE for compiling !
  *
  *
  */
 
 #ifndef _OContactAccessBackend_XML_
 #define _OContactAccessBackend_XML_
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
 
 #include <qpe/global.h>
 
 #include <opie/xmltree.h>
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 
 #include <stdlib.h>
 #include <errno.h>
 
 using namespace Opie;
@@ -274,98 +277,98 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
                         if ( (*it).match( r ) ){
                                 m_currentQuery[arraycounter++] = (*it).uid();
                         }
                         
                 }
                 // Shrink to fit..
                 m_currentQuery.resize(arraycounter);
 
                 return m_currentQuery;
         }
         
         const uint querySettings()
                 {
                         return ( OContactAccess::WildCards
                                  & OContactAccess::IgnoreCase
                                  & OContactAccess::RegExp
                                  & OContactAccess::ExactMatch );
                 }
         
         bool hasQuerySettings (uint querySettings) const
                 {
                         /* OContactAccess::IgnoreCase may be added with one
                          * of the other settings, but never used alone.
                          * The other settings are just valid alone...
                          */
                         switch ( querySettings & ~OContactAccess::IgnoreCase ){
                         case OContactAccess::RegExp:
                                 return ( true );
                         case OContactAccess::WildCards:
                                 return ( true );
                         case OContactAccess::ExactMatch:
                                 return ( true );
                         default:
                                 return ( false );
                         }
                 }
         
         // Currently only asc implemented.. 
         QArray<int> sorted( bool asc,  int , int ,  int ) 
                 {
                         QMap<QString, int> nameToUid;
                         QStringList names;
                         QArray<int> m_currentQuery( m_contactList.count() );
 
                         // First fill map and StringList with all Names 
                         // Afterwards sort namelist and use map to fill array to return..
                         QValueListConstIterator<OContact> it;
                         for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
-                                names.append( (*it).fileAs() );
-                                nameToUid.insert( (*it).fileAs(), (*it).uid() );
+                                names.append( (*it).fileAs() + QString::number( (*it).uid() ) );
+                                nameToUid.insert( (*it).fileAs() + QString::number( (*it).uid() ), (*it).uid() );
                         }
                         names.sort();
 
                         int i = 0;
                         if ( asc ){
                                 for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
                                         m_currentQuery[i++] = nameToUid[ (*it) ];
                         }else{
                                 for ( QStringList::Iterator it = names.end(); it != names.begin(); --it )
                                         m_currentQuery[i++] = nameToUid[ (*it) ];
                         }
                         
                         return m_currentQuery;
                         
                 }
         bool add ( const OContact &newcontact )
                 {
                         //qWarning("odefaultbackend: ACTION::ADD");
                         updateJournal (newcontact, OContact::ACTION_ADD);
                         addContact_p( newcontact );
                         
                         m_changed = true;
 
                         return true;
                 }
         
         bool replace ( const OContact &contact )
                 {
                         m_changed = true;
 
                         bool found = false;
                         
                         QValueListIterator<OContact> it;
                         for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
                                 if ( (*it).uid() == contact.uid() ){
                                         found = true;
                                         break;
                                 }
                         }
                         if (found) {
                                 updateJournal (contact, OContact::ACTION_REPLACE);
                                 m_contactList.remove (it);
                                 m_contactList.append (contact);
                                 return true;
                         } else
                                 return false;
                 }