author | eilers <eilers> | 2004-05-16 16:21:51 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-05-16 16:21:51 (UTC) |
commit | 0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914 (patch) (side-by-side diff) | |
tree | bca776a6ab6d751bdbd9861f95c4dc5bc57752a0 | |
parent | 52691aca593d6b321597d26467b9e9af9ec0b6fe (diff) | |
download | opie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.zip opie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.tar.gz opie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.tar.bz2 |
Improved accessing of default database style by using OPimGlobal::DEFAULT
-rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 28 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimaccessfactory.h | 18 |
2 files changed, 37 insertions, 9 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h index d8caa80..993ecb4 100644 --- a/libopie2/opiepim/backend/obackendfactory.h +++ b/libopie2/opiepim/backend/obackendfactory.h @@ -1,198 +1,208 @@ /* This file is part of the Opie Project 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 .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This program 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. */ /* * ===================================================================== * ToDo: Use plugins * ===================================================================== */ #ifndef OPIE_BACKENDFACTORY_H_ #define OPIE_BACKENDFACTORY_H_ #include <qstring.h> #include <qasciidict.h> #include <qpe/config.h> #include <opie2/opimglobal.h> #include <opie2/otodoaccessxml.h> #include <opie2/ocontactaccessbackend_xml.h> #include <opie2/odatebookaccessbackend_xml.h> #ifdef __USE_SQL #include <opie2/otodoaccesssql.h> #include <opie2/ocontactaccessbackend_sql.h> #include <opie2/odatebookaccessbackend_sql.h> #endif using namespace Opie; using namespace Opie::Pim; namespace Opie { class OBackendPrivate; /** * This class is our factory. It will give us the default implementations * of at least Todolist, Contacts and Datebook. In the future this class will * allow users to switch the backend with ( XML->SQLite ) without the need * to recompile.# * This class - as the whole PIM Api - is making use of templates * * <pre> * OPimTodoAccessBackend* backend = OBackEndFactory<OPimTodoAccessBackend>::Default("todo", QString::null ); * backend->load(); * </pre> * * @author Stefan Eilers * @version 0.1 */ template<class T> class OBackendFactory { public: OBackendFactory() {}; /** * 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 ); + // If we should use the dafult database style, we have to request it + OPimGlobal::DatabaseStyle used_database = database; + if ( database == OPimGlobal::DEFAULT ){ + used_database = defaultDB( type ); + } + switch ( type ){ case OPimGlobal::TODOLIST: #ifdef __USE_SQL - if ( database == OPimGlobal::SQL ) + if ( used_database == OPimGlobal::SQL ) return (T*) new OPimTodoAccessBackendSQL(""); #else - if ( database == OPimGlobal::SQL ) + if ( used_database == OPimGlobal::SQL ) qWarning ("OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!"); #endif return (T*) new OPimTodoAccessXML( appName ); case OPimGlobal::CONTACTLIST: #ifdef __USE_SQL - if ( database == OPimGlobal::SQL ) + if ( used_database == OPimGlobal::SQL ) return (T*) new OPimContactAccessBackend_SQL(""); #else - if ( database == OPimGlobal::SQL ) + if ( used_database == OPimGlobal::SQL ) qWarning ("OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!"); #endif return (T*) new OPimContactAccessBackend_XML( appName ); case OPimGlobal::DATEBOOK: #ifdef __USE_SQL - if ( database == OPimGlobal::SQL ) + if ( used_database == OPimGlobal::SQL ) return (T*) new ODateBookAccessBackend_SQL(""); #else - if ( database == OPimGlobal::SQL ) + if ( used_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 ){ + /** + * Returns the style of the default database which is used to contact PIM data. + * @param type the type of the backend + * @see OPimGlobal + */ + static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType type ){ QString group_name; - switch ( backend ){ + switch ( type ){ 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) ); int* backend_find = dictBackends[ backendName ]; if ( !backend_find ) return NULL; OPimGlobal::DatabaseStyle style = defaultDB( static_cast<OPimGlobal::PimType>( *backend_find ) ); qDebug( "OBackendFactory::Default -> Backend is %s, Database is %d", backendName.latin1(), style ); return create( (OPimGlobal::PimType) *backend_find, style, appName ); } private: OBackendPrivate* d; }; } #endif diff --git a/libopie2/opiepim/core/opimaccessfactory.h b/libopie2/opiepim/core/opimaccessfactory.h index ba99a15..eecfa96 100644 --- a/libopie2/opiepim/core/opimaccessfactory.h +++ b/libopie2/opiepim/core/opimaccessfactory.h @@ -1,100 +1,118 @@ /* This file is part of the Opie Project 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 .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This program 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. */ #ifndef __OPIE_OPIMACCESSFACTORY_H_ #define __OPIE_OPIMACCESSFACTORY_H_ #include <opie2/opimglobal.h> #include <opie2/obackendfactory.h> #include <opie2/ocontactaccess.h> #include <opie2/otodoaccess.h> #include <opie2/odatebookaccess.h> using namespace Opie::Pim; namespace Opie { /** * This class is our factory for creating PIM access objects. You should use these objects to load, store and search * information in our PIM databases. Currently we support objects for accessing the datebook, the contact- and the * todolist. * @see OPimGlobal for more information of used values. * * This class - as the whole PIM Api - is making use of templates * * Example for getting an access object for the XML database of todolist: * <pre> * OPimTodoAccess* access = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "example" ); * </pre> * * @author Stefan Eilers * @version 0.1 */ */ template<class T> class OPimAccessFactory { public: // Maybe we should introduce a global class for storing such global enums // (something like opimglobal.h) ? (eilers) OPimAccessFactory() {}; /** * Returns the selected PIM access-object. * @param type Type of the selected database (addressbook, todolist or datebook) * @param dbStyle Which database style should be used (xml, sql, vcard) * @param appName "Name" of your application. This should be any constant string which is used * by some backends for creating special files (i.e.journal files). Please keep the * string unique for your application ! * @see OPimGlobal */ static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle dbStyle, const QString& appName ){ switch ( type ){ case OPimGlobal::TODOLIST: return dynamic_cast<T*>( new OPimTodoAccess( OBackendFactory<OPimTodoAccessBackend>::create( type, dbStyle, appName ) ) ); case OPimGlobal::CONTACTLIST: return dynamic_cast<T*>( new OPimContactAccess( QString::null, QString::null, OBackendFactory<OPimContactAccessBackend>::create( type, dbStyle, appName ) ) ); case OPimGlobal::DATEBOOK: return dynamic_cast<T*>( new ODateBookAccess( OBackendFactory<ODateBookAccessBackend>::create( type, dbStyle, appName ) ) ); default: return 0l; } } + + + /** + * Returns the selected PIM access-object, using the default database style + * Which style is selected is defined in the configfile "pimaccess.conf" in + * the directory "Settings" + * @param type Type of the selected database (addressbook, todolist or datebook) + * @param appName "Name" of your application. This should be any constant string which is used + * by some backends for creating special files (i.e.journal files). Please keep the + * string unique for your application ! + * @see OPimGlobal + * + */ + static T* default( OPimGlobal::PimType type, const QString& appName ){ + + return create( type, OPimGlobal::DEFAULT, appName ) + + } }; } #endif |