| -rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 61 | ||||
| -rw-r--r-- | libopie2/opiepim/core/opimglobal.h | 2 |
2 files changed, 46 insertions, 17 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h index d101373..d8caa80 100644 --- a/libopie2/opiepim/backend/obackendfactory.h +++ b/libopie2/opiepim/backend/obackendfactory.h @@ -69,25 +69,25 @@ class OBackendPrivate; * </pre> * * @author Stefan Eilers * @version 0.1 */ template<class T> class OBackendFactory { public: OBackendFactory() {}; /** - * Returns a backend implementation + * Returns a selected backend implementation * @param type the type of the backend * @param database the type of the used database * @param appName The name of your application. It will be passed on to the backend. */ static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database, const QString& appName ){ qWarning("Selected backend for %d is: %d", type, database ); switch ( type ){ case OPimGlobal::TODOLIST: #ifdef __USE_SQL if ( database == OPimGlobal::SQL ) @@ -116,56 +116,83 @@ class OBackendFactory if ( database == OPimGlobal::SQL ) qWarning("OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!"); #endif return (T*) new ODateBookAccessBackend_XML( appName ); default: return (T*) NULL; } } + + static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType backend ){ + QString group_name; + switch ( backend ){ + case OPimGlobal::TODOLIST: + group_name = "todo"; + break; + case OPimGlobal::CONTACTLIST: + group_name = "contact"; + break; + case OPimGlobal::DATEBOOK: + group_name = "datebook"; + break; + default: + group_name = "unknown"; + } + + Config config( "pimaccess" ); + config.setGroup ( group_name ); + QString db_String = config.readEntry( "usebackend" ); + + QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle ); + dictDbTypes.setAutoDelete( TRUE ); + + dictDbTypes.insert( "xml", new int (OPimGlobal::XML) ); + dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) ); + dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) ); + + int* db_find = dictDbTypes[ db_String ]; + + if ( !db_find ) + return OPimGlobal::UNKNOWN; + + return (OPimGlobal::DatabaseStyle) *db_find; + } + + /** * Returns the default backend implementation for backendName. Which one is used, is defined * by the configfile "pimaccess.conf". * @param backendName the type of the backend (use "todo", "contact" or "datebook" ) * @param appName The name of your application. It will be passed on to the backend */ static T* Default( const QString backendName, const QString& appName ){ QAsciiDict<int> dictBackends( OPimGlobal::_END_PimType ); dictBackends.setAutoDelete ( TRUE ); dictBackends.insert( "todo", new int (OPimGlobal::TODOLIST) ); dictBackends.insert( "contact", new int (OPimGlobal::CONTACTLIST) ); dictBackends.insert( "datebook", new int(OPimGlobal::DATEBOOK) ); - QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle ); - dictDbTypes.setAutoDelete( TRUE ); - - dictDbTypes.insert( "xml", new int (OPimGlobal::XML) ); - dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) ); - dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) ); - - Config config( "pimaccess" ); - config.setGroup ( backendName ); - QString db_String = config.readEntry( "usebackend" ); - - int* db_find = dictDbTypes[ db_String ]; int* backend_find = dictBackends[ backendName ]; - if ( !backend_find || !db_find ) return NULL; + if ( !backend_find ) return NULL; + + OPimGlobal::DatabaseStyle style = defaultDB( static_cast<OPimGlobal::PimType>( *backend_find ) ); - qDebug( "OBackendFactory::Default -> Backend is %s, Database is %s", backendName.latin1(), - db_String.latin1() ); + qDebug( "OBackendFactory::Default -> Backend is %s, Database is %d", backendName.latin1(), + style ); - return create( (OPimGlobal::PimType) *backend_find, (OPimGlobal::DatabaseStyle) *db_find, appName ); + return create( (OPimGlobal::PimType) *backend_find, style, appName ); } private: OBackendPrivate* d; }; } #endif diff --git a/libopie2/opiepim/core/opimglobal.h b/libopie2/opiepim/core/opimglobal.h index 2d336b4..d56c9be 100644 --- a/libopie2/opiepim/core/opimglobal.h +++ b/libopie2/opiepim/core/opimglobal.h @@ -37,24 +37,26 @@ namespace Pim{ * Contains global types and enums for the PIM-API */ class OPimGlobal{ public: enum PimType { TODOLIST, CONTACTLIST, DATEBOOK, _END_PimType }; enum DatabaseStyle { + DEFAULT, // Use default Database + UNKNOWN, // Unknown database style XML, SQL, VCARD, _END_DatabaseStyle }; }; } } |