Fix relative paths for offline editing

m-kuhn · m-kuhn · commit e4a69234d41e · 2016-07-05T19:21:25.000+02:00
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -186,7 +186,7 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString& offlineDataPath,
       projectTitle += " (offline)";
       QgsProject::instance()->setTitle( projectTitle );
 
-      QgsProject::instance()->writeEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH, dbPath );
+      QgsProject::instance()->writeEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH, QgsProject::instance()->writePath( dbPath ) );
 
       return true;
     }
@@ -942,7 +942,8 @@ sqlite3* QgsOfflineEditing::openLoggingDb()
   QString dbPath = QgsProject::instance()->readEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH );
   if ( !dbPath.isEmpty() )
   {
-    int rc = sqlite3_open( dbPath.toUtf8().constData(), &db );
+    QString absoluteDbPath = QgsProject::instance()->readPath( dbPath );
+    int rc = sqlite3_open( absoluteDbPath.toUtf8().constData(), &db );
     if ( rc != SQLITE_OK )
     {
       QgsDebugMsg( "Could not open the spatialite logging database" );

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString& offlineDataPath,`
`186`	`186`	`projectTitle += " (offline)";`
`187`	`187`	`QgsProject::instance()->setTitle( projectTitle );`
`188`	`188`
`189`		`- QgsProject::instance()->writeEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH, dbPath );`
	`189`	`+ QgsProject::instance()->writeEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH, QgsProject::instance()->writePath( dbPath ) );`
`190`	`190`
`191`	`191`	`return true;`
`192`	`192`	`}`
`@@ -942,7 +942,8 @@ sqlite3* QgsOfflineEditing::openLoggingDb()`
`942`	`942`	`QString dbPath = QgsProject::instance()->readEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH );`
`943`	`943`	`if ( !dbPath.isEmpty() )`
`944`	`944`	`{`
`945`		`- int rc = sqlite3_open( dbPath.toUtf8().constData(), &db );`
	`945`	`+ QString absoluteDbPath = QgsProject::instance()->readPath( dbPath );`
	`946`	`+ int rc = sqlite3_open( absoluteDbPath.toUtf8().constData(), &db );`
`946`	`947`	`if ( rc != SQLITE_OK )`
`947`	`948`	`{`
`948`	`949`	`QgsDebugMsg( "Could not open the spatialite logging database" );`