support embedding of spatialite layers on relative paths

jef-n · jef-n · commit 03c5998a00f3 · 2013-03-11T16:21:25.000+01:00
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -31,6 +31,7 @@
 #include "qgsprojectversion.h"
 #include "qgspluginlayer.h"
 #include "qgspluginlayerregistry.h"
+#include "qgsdatasourceuri.h"
 
 #include <QApplication>
 #include <QFileInfo>
@@ -1597,13 +1598,31 @@ bool QgsProject::createEmbeddedLayer( const QString& layerId, const QString& pro
       //change datasource path from relative to absolute if necessary
       if ( !useAbsolutePathes )
       {
-        QDomElement dsElem = mapLayerElem.firstChildElement( "datasource" );
-        QString debug( QFileInfo( projectFilePath ).absolutePath() + "/" + dsElem.text() );
-        QFileInfo absoluteDs( QFileInfo( projectFilePath ).absolutePath() + "/" + dsElem.text() );
-        if ( absoluteDs.exists() )
+        QDomElement provider = mapLayerElem.firstChildElement( "provider" );
+        if ( provider.text() == "spatialite" )
         {
-          dsElem.removeChild( dsElem.childNodes().at( 0 ) );
-          dsElem.appendChild( projectDocument.createTextNode( absoluteDs.absoluteFilePath() ) );
+          QDomElement dsElem = mapLayerElem.firstChildElement( "datasource" );
+
+          QgsDataSourceURI uri( dsElem.text() );
+
+          QFileInfo absoluteDs( QFileInfo( projectFilePath ).absolutePath() + "/" + uri.database() );
+          if ( absoluteDs.exists() )
+          {
+            uri.setDatabase( absoluteDs.absoluteFilePath() );
+            dsElem.removeChild( dsElem.childNodes().at( 0 ) );
+            dsElem.appendChild( projectDocument.createTextNode( uri.uri() ) );
+          }
+        }
+        else
+        {
+          QDomElement dsElem = mapLayerElem.firstChildElement( "datasource" );
+          QString debug( QFileInfo( projectFilePath ).absolutePath() + "/" + dsElem.text() );
+          QFileInfo absoluteDs( QFileInfo( projectFilePath ).absolutePath() + "/" + dsElem.text() );
+          if ( absoluteDs.exists() )
+          {
+            dsElem.removeChild( dsElem.childNodes().at( 0 ) );
+            dsElem.appendChild( projectDocument.createTextNode( absoluteDs.absoluteFilePath() ) );
+          }
         }
       }
 
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2313,7 +2313,6 @@ bool QgsVectorLayer::readXml( const QDomNode& layer_node )
 } // void QgsVectorLayer::readXml
 
 
-
 bool QgsVectorLayer::setDataProvider( QString const & provider )
 {
   // XXX should I check for and possibly delete any pre-existing providers?
@@ -2619,7 +2618,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
       mEditTypes.insert( name, editType );
 
       int editable = editTypeElement.attribute( "editable" , "1" ).toInt();
-      mFieldEditables.insert( name, editable == 1);
+      mFieldEditables.insert( name, editable == 1 );
 
       switch ( editType )
       {
@@ -2936,7 +2935,7 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&
       QDomElement editTypeElement = doc.createElement( "edittype" );
       editTypeElement.setAttribute( "name", it.key() );
       editTypeElement.setAttribute( "type", it.value() );
-      editTypeElement.setAttribute( "editable", mFieldEditables[ it.key()]?1:0 );
+      editTypeElement.setAttribute( "editable", mFieldEditables[ it.key()] ? 1 : 0 );
 
       switch (( EditType ) it.value() )
       {
@@ -3903,7 +3902,7 @@ bool QgsVectorLayer::fieldEditable( int idx )
 {
   const QgsFields &fields = pendingFields();
   if ( idx >= 0 && idx < fields.count() && mEditTypes.contains( fields[idx].name() ) )
-    return mFieldEditables[ fields[idx].name() ];
+    return mFieldEditables[ fields[idx].name()];
   else
     return false;
 }
@@ -3912,7 +3911,7 @@ void QgsVectorLayer::setFieldEditable( int idx, bool editable )
 {
   const QgsFields &fields = pendingFields();
   if ( idx >= 0 && idx < fields.count() && mEditTypes.contains( fields[idx].name() ) )
-    mFieldEditables[ fields[idx].name() ] = editable;
+    mFieldEditables[ fields[idx].name()] = editable;
 }
 
 void QgsVectorLayer::addOverlay( QgsVectorOverlay* overlay )

Original file line number	Diff line number	Diff line change
`@@ -2313,7 +2313,6 @@ bool QgsVectorLayer::readXml( const QDomNode& layer_node )`
`2313`	`2313`	`} // void QgsVectorLayer::readXml`
`2314`	`2314`
`2315`	`2315`
`2316`		`-`
`2317`	`2316`	`bool QgsVectorLayer::setDataProvider( QString const & provider )`
`2318`	`2317`	`{`
`2319`	`2318`	`// XXX should I check for and possibly delete any pre-existing providers?`
`@@ -2619,7 +2618,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage`
`2619`	`2618`	`mEditTypes.insert( name, editType );`
`2620`	`2619`
`2621`	`2620`	`int editable = editTypeElement.attribute( "editable" , "1" ).toInt();`
`2622`		`- mFieldEditables.insert( name, editable == 1);`
	`2621`	`+ mFieldEditables.insert( name, editable == 1 );`
`2623`	`2622`
`2624`	`2623`	`switch ( editType )`
`2625`	`2624`	`{`
`@@ -2936,7 +2935,7 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&`
`2936`	`2935`	`QDomElement editTypeElement = doc.createElement( "edittype" );`
`2937`	`2936`	`editTypeElement.setAttribute( "name", it.key() );`
`2938`	`2937`	`editTypeElement.setAttribute( "type", it.value() );`
`2939`		`- editTypeElement.setAttribute( "editable", mFieldEditables[ it.key()]?1:0 );`
	`2938`	`+ editTypeElement.setAttribute( "editable", mFieldEditables[ it.key()] ? 1 : 0 );`
`2940`	`2939`
`2941`	`2940`	`switch (( EditType ) it.value() )`
`2942`	`2941`	`{`
`@@ -3903,7 +3902,7 @@ bool QgsVectorLayer::fieldEditable( int idx )`
`3903`	`3902`	`{`
`3904`	`3903`	`const QgsFields &fields = pendingFields();`
`3905`	`3904`	`if ( idx >= 0 && idx < fields.count() && mEditTypes.contains( fields[idx].name() ) )`
`3906`		`- return mFieldEditables[ fields[idx].name() ];`
	`3905`	`+ return mFieldEditables[ fields[idx].name()];`
`3907`	`3906`	`else`
`3908`	`3907`	`return false;`
`3909`	`3908`	`}`
`@@ -3912,7 +3911,7 @@ void QgsVectorLayer::setFieldEditable( int idx, bool editable )`
`3912`	`3911`	`{`
`3913`	`3912`	`const QgsFields &fields = pendingFields();`
`3914`	`3913`	`if ( idx >= 0 && idx < fields.count() && mEditTypes.contains( fields[idx].name() ) )`
`3915`		`- mFieldEditables[ fields[idx].name() ] = editable;`
	`3914`	`+ mFieldEditables[ fields[idx].name()] = editable;`
`3916`	`3915`	`}`
`3917`	`3916`
`3918`	`3917`	`void QgsVectorLayer::addOverlay( QgsVectorOverlay* overlay )`