Backendfactory allows to request the default database style which is defined

by Settings/pimaccess.conf.
This will be used by the OPimAccessFactory .. see next commit..

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
@@ -57,115 +57,142 @@ 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 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 )
 				return (T*) new OPimTodoAccessBackendSQL("");
 #else
 			if ( 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 )
 				return (T*) new OPimContactAccessBackend_SQL("");
 #else
 			if ( 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 )
 				return (T*) new ODateBookAccessBackend_SQL("");
 #else
 			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
@@ -25,38 +25,40 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #ifndef __OPIMGLOBAL_H_
 #define __OPIMGLOBAL_H_
 
 namespace Opie{
 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
 	};
 
 
 };
 
 }
 }
 
 
 #endif