Merge pull request #9 from nemomobile/db-filepath-fix

[buteo-syncml] Fix profile removal - set absolute file path when calling...
sailfishos · Feb 12, 2014 · d4d46e9 · d4d46e9
2 parents b1904c5 + 70864c5
commit d4d46e9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/DatabaseHandler.cpp b/src/DatabaseHandler.cpp
@@ -34,13 +34,12 @@
 #include "DatabaseHandler.h"
 
 #include "LogMacros.h"
-#include "SyncCommonDefs.h"
 
 using namespace DataSync;
 
 const QString CONNECTIONNAME( "dbhandler" );
 
-DatabaseHandler::DatabaseHandler( const QString& aDbFile )
+DatabaseHandler::DatabaseHandler( const QString& aDbFilePath )
 {
     FUNCTION_CALL_TRACE;
 
@@ -49,12 +48,7 @@ DatabaseHandler::DatabaseHandler( const QString& aDbFile )
     iConnectionName = CONNECTIONNAME + QString::number( connectionNumber++ );
     iDb = QSqlDatabase::addDatabase( "QSQLITE", iConnectionName );
 
-    QString path( Sync::syncCacheDir() );
-    path.append( QDir::separator() ).append( aDbFile );
-    path = QDir::toNativeSeparators( path );
-    QDir().mkpath( QFileInfo(path).path() );
-
-    iDb.setDatabaseName( path );
+    iDb.setDatabaseName( aDbFilePath );
     if(!iDb.open())
 	    LOG_CRITICAL("can not open database");
 

diff --git a/src/DatabaseHandler.h b/src/DatabaseHandler.h
@@ -48,10 +48,10 @@ class DatabaseHandler {
 
     /*! \brief Constructor
      *
-     * @param aDbFile Database filename to create and open
+     * @param aDbFile Path of database file to create and open
      *
      */
-    explicit DatabaseHandler( const QString& aDbFile );
+    explicit DatabaseHandler( const QString& aDbFilePath );
 
     /*! \brief Destructor
      *

diff --git a/src/SyncAgentConfig.cpp b/src/SyncAgentConfig.cpp
@@ -37,9 +37,11 @@
 #include <QXmlSchemaValidator>
 #include <QXmlStreamReader>
 #include <QFile>
+#include <QDir>
 #include <QStringList>
 
 #include "SyncAgentConfigProperties.h"
+#include "SyncCommonDefs.h"
 #include "datatypes.h"
 #include "Transport.h"
 
@@ -400,7 +402,18 @@ bool SyncAgentConfig::parseConfFile( const QByteArray& aData )
                 reader.readNext();
                 QString dbPath = reader.text().toString();
                 LOG_DEBUG( "Found critical property" << DBPATH <<":" << dbPath );
-                setDatabaseFilePath( dbPath );
+
+                QFileInfo dbPathInfo(dbPath);
+                if (dbPathInfo.isAbsolute()) {
+                    setDatabaseFilePath( dbPath );
+                } else {
+                    if (QDir().mkpath(Sync::syncCacheDir())) {
+                        setDatabaseFilePath(Sync::syncCacheDir() + QDir::separator() + dbPathInfo.fileName());
+                    } else {
+                        LOG_CRITICAL("Unable to create database dir");
+                        return false;
+                    }
+                }
             }
             else if( reader.name() == LOCALDEVICENAME )
             {