1 files changed, 1 insertions, 176 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index d16d692..1ea35a8 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -1,9 +1,9 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) The Main Author <main-author@whereever.org>
+                             Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
@@ -46,25 +46,12 @@
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 using namespace Opie::DB;
 
 
-// If defined, we use a horizontal table ( uid, attr1, attr2, attr3, ..., attrn ) instead
-// vertical like "uid, type, value".
-// DON'T DEACTIVATE THIS DEFINE IN PRODUCTIVE ENVIRONMENTS !!
-#define __STORE_HORIZONTAL_
-
-// Distinct loading is not very fast. If I expect that every person has just
-// one (and always one) 'Last Name', I can request all uid's for existing lastnames, 
-// which is faster..
-// But this may not be true for all entries, like company contacts..
-// The current AddressBook application handles this problem, but other may not.. (eilers)
-#define __USE_SUPERFAST_LOADQUERY
-
-
 /*
  * Implementation of used query types
  * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
@@ -169,31 +156,23 @@ namespace Opie {
         // All tables are connected by the uid of the contact.
         // Maybe I should add a table for meta-information ? 
         CreateQuery::CreateQuery() : OSQLQuery() {}
         CreateQuery::~CreateQuery() {}
         QString CreateQuery::query()const {
                 QString qu;
-#ifdef __STORE_HORIZONTAL_
 
                 qu += "create table addressbook( uid PRIMARY KEY ";
 
                 QStringList fieldList = OPimContactFields::untrfields( false );
                 for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
                         qu += QString( ",\"%1\" VARCHAR(10)" ).arg( *it );
                 }
                 qu += " );";
                 
                 qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR, priority INTEGER, value VARCHAR, PRIMARY KEY /* identifier */ (uid, id) );";
 
-#else
-
-                qu += "create table addressbook( uid INTEGER, id INTEGER, type VARCHAR, priority INTEGER, value VARCHAR, PRIMARY KEY /* identifier */ (uid, id));";
-                qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR, priority INTEGER, value VARCHAR, PRIMARY KEY /* identifier */ (uid, id) );";
-        //      qu += "create table dates( uid PRIMARY KEY, type, day, month, year, hour, minute, second );";
-
-#endif // __STORE_HORIZONTAL_
                 return qu;
         }
         
         ClearQuery::ClearQuery()
                 : OSQLQuery() {}
         ClearQuery::~ClearQuery() {}
@@ -206,21 +185,13 @@ namespace Opie {
 
 
         LoadQuery::LoadQuery() : OSQLQuery() {}
         LoadQuery::~LoadQuery() {}
         QString LoadQuery::query()const {
                 QString qu;
-#ifdef __STORE_HORIZONTAL_
                 qu += "select uid from addressbook";
-#else
-#  ifndef __USE_SUPERFAST_LOADQUERY 
-                qu += "select distinct uid from addressbook";
-#  else
-                qu += "select uid from addressbook where type = 'Last Name'";
-#  endif // __USE_SUPERFAST_LOADQUERY 
-#endif // __STORE_HORIZONTAL_
                 
                 return qu;
         }
         
 
         InsertQuery::InsertQuery( const OPimContact& contact )
@@ -232,13 +203,12 @@ namespace Opie {
 
         /*
          * converts from a OPimContact to a query
          */
         QString InsertQuery::query()const{
 
-#ifdef __STORE_HORIZONTAL_
                 QString qu;
                 qu  += "insert into addressbook VALUES( " + 
                         QString::number( m_contact.uid() );
 
                 // Get all information out of the contact-class
                 // Remember: The category is stored in contactMap, too ! 
@@ -284,81 +254,14 @@ namespace Opie {
                                 qu += QString( ",\"%1\"" ).arg( contactMap[id] );
                         }
                 }
                 qu += " );";
 
                         
-#else
-                // Get all information out of the contact-class
-                // Remember: The category is stored in contactMap, too ! 
-                QMap<int, QString> contactMap = m_contact.toMap();
-                
-                QMap<QString, QString> addressbook_db;
-                
-                // Get the translation from the ID to the String
-                QMap<int, QString> transMap = OPimContactFields::idToUntrFields();
-                
-                for( QMap<int, QString>::Iterator it = contactMap.begin(); 
-                     it != contactMap.end(); ++it ){
-                        switch ( it.key() ){
-                        case Qtopia::Birthday:{
-                                // These entries should stored in a special format
-                                // year-month-day
-                                QDate day = m_contact.birthday();
-                                addressbook_db.insert( transMap[it.key()], 
-                                                       QString("%1-%2-%3")
-                                                       .arg( day.year() )
-                                                       .arg( day.month() )
-                                                       .arg( day.day() ) );
-                        }
-                                break;
-                        case Qtopia::Anniversary:{
-                                // These entries should stored in a special format
-                                // year-month-day
-                                QDate day = m_contact.anniversary();
-                                addressbook_db.insert( transMap[it.key()], 
-                                                       QString("%1-%2-%3")
-                                                       .arg( day.year() )
-                                                       .arg( day.month() )
-                                                       .arg( day.day() ) );
-                        }
-                                break;
-                        case Qtopia::AddressUid: // Ignore UID
-                                break;
-                        default: // Translate id to String
-                                addressbook_db.insert( transMap[it.key()], it.data() );
-                                break;
-                        }
-                
-                }
-                
-                // Now convert this whole stuff into a SQL String, beginning with
-                // the addressbook table..
-                QString qu;
-                // qu  += "begin transaction;";
-                int id = 0;
-                for( QMap<QString, QString>::Iterator it = addressbook_db.begin(); 
-                     it != addressbook_db.end(); ++it ){
-                        qu  += "insert into addressbook VALUES(" 
-                                +  QString::number( m_contact.uid() )
-                                + ","
-                                +  QString::number( id++ ) 
-                                + ",'" 
-                                + it.key() //.latin1()
-                                + "',"
-                                + "0"  // Priority for future enhancements
-                                + ",'" 
-                                + it.data()  //.latin1()
-                                + "');";
-                }
-
-        #endif          //__STORE_HORIZONTAL_
                 // Now add custom data..
-#ifdef __STORE_HORIZONTAL_
                 int id = 0;
-#endif
                 id = 0;
                 QMap<QString, QString> customMap = m_contact.toExtraMap();
                 for( QMap<QString, QString>::Iterator it = customMap.begin(); 
                      it != customMap.end(); ++it ){
                         qu  += "insert into custom_data VALUES(" 
                                 +  QString::number( m_contact.uid() )
@@ -414,27 +317,19 @@ namespace Opie {
                         qu += " UID = " + QString::number( m_uids[i] ) + " OR";
                 }
                 qu.remove( qu.length()-2, 2 ); // Hmmmm.. 
                 return qu;
         }
         */
-#ifdef __STORE_HORIZONTAL_
         QString FindQuery::single()const{
                 QString qu = "select *";
                 qu += " from addressbook where uid = " + QString::number(m_uid);
 
                 // qWarning("find query: %s", qu.latin1() );
                 return qu;
         }
-#else
-        QString FindQuery::single()const{
-                QString qu = "select uid, type, value from addressbook where uid = ";
-                qu += QString::number(m_uid);
-                return qu;
-        }
-#endif
 
 
         FindCustomQuery::FindCustomQuery(int uid)
                 : OSQLQuery(), m_uid( uid ) {
         }
         FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
@@ -705,19 +600,14 @@ bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const
 
 QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
 {
         QTime t;
         t.start();
 
-#ifdef __STORE_HORIZONTAL_
         QString query = "SELECT uid FROM addressbook ";
         query += "ORDER BY \"Last Name\" ";
-#else
-        QString query = "SELECT uid FROM addressbook WHERE type = 'Last Name' ";
-        query += "ORDER BY upper( value )";
-#endif
 
         if ( !asc )
                 query += "DESC";
 
         // qWarning("sorted query is: %s", query.latin1() ); 
 
@@ -774,13 +664,12 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
         qWarning("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
 
         return ints;
 
 }
 
-#ifdef __STORE_HORIZONTAL_
 QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) const
 {
         QTime t;
         t.start();
 
         QMap<int, QString> nonCustomMap;
@@ -838,76 +727,12 @@ QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co
         // qWarning("Adding UID: %s", resItem.data( "uid" ).latin1() );
         qWarning("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", 
                  t.elapsed(), t2needed, t3needed  );
 
         return nonCustomMap;
 }
-#else
-
-QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) const
-{
-        QTime t;
-        t.start();
-
-        QMap<int, QString> nonCustomMap;
-        
-        int t2needed = 0;
-        QTime t2;
-        t2.start();
-        FindQuery query( uid );
-        OSQLResult res_noncustom = m_driver->query( &query );
-        t2needed = t2.elapsed();
-
-        if ( res_noncustom.state() == OSQLResult::Failure ) {
-                qWarning("OSQLResult::Failure in find query !!");
-                QMap<int, QString> empty;
-                return empty;
-                }
-
-        int t3needed = 0;
-        QTime t3;
-        t3.start();
-        QMap<QString, int> translateMap = OPimContactFields::untrFieldsToId();
-
-        OSQLResultItem::ValueList list = res_noncustom.results();
-        OSQLResultItem::ValueList::Iterator it = list.begin();
-        for ( ; it != list.end(); ++it ) {
-                if ( (*it).data("type") != "" ){
-                        int typeId = translateMap[(*it).data( "type" )];
-                        switch( typeId ){
-                        case Qtopia::Birthday:
-                        case Qtopia::Anniversary:{
-                                // Birthday and Anniversary are encoded special ( yyyy-mm-dd )
-                                QStringList list = QStringList::split( '-', (*it).data( "value" ) );
-                                QStringList::Iterator lit = list.begin();
-                                int year  = (*lit).toInt();
-                                qWarning("1. %s", (*lit).latin1());
-                                int month = (*(++lit)).toInt();
-                                qWarning("2. %s", (*lit).latin1());
-                                int day   = (*(++lit)).toInt();
-                                qWarning("3. %s", (*lit).latin1());
-                                qWarning( "RequestNonCustom->Converting:%s to Year: %d, Month: %d, Day: %d ", (*it).data( "value" ).latin1(), year, month, day );
-                                QDate date( year, month, day );
-                                nonCustomMap.insert( typeId, OPimDateConversion::dateToString( date ) );
-                        }
-                                break;
-                        default:
-                                nonCustomMap.insert( typeId, 
-                                                     (*it).data( "value" ) );
-                        }
-                }
-        }
-        // Add UID to Map..
-        nonCustomMap.insert( Qtopia::AddressUid, QString::number( uid ) );
-        t3needed = t3.elapsed();
-
-        qWarning("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", t.elapsed(), t2needed, t3needed  );
-        return nonCustomMap;
-}
-
-#endif // __STORE_HORIZONTAL_
 
 QMap<QString, QString>  OPimContactAccessBackend_SQL::requestCustom( int uid ) const
 {
         QTime t;
         t.start();