[Server][BUGFIX] Resolve relative pathes (SVGMArker, Netcdf, etc)

rldhont · rldhont · commit b54d2790d4b7 · 2015-09-22T09:41:22.000+02:00
QGIS-Server has some trouble to resolve relative pathes. For example,
 SVGMarker path and NETCDF datasource are not resolved in QGIS Server unlike
 in QGIS Desktop.

To resolve relative path for SVGMarker, the class QgsSombolLayerV2Utils is
 used and it based on QgsProject::instance()-&gt;fileName().
To resolve relative path for NETCDF datasource and other GDAL datasources, the
 class QgsMapLayer is used and it based on
 QgsProject::instance()-&gt;readPath( filename ).

To fix the issue, the QgsProject instance fileName is set in the
 QgsServerProjectParser constructor.
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -76,6 +76,12 @@ QgsServerProjectParser::QgsServerProjectParser( QDomDocument* xmlDoc, const QStr
       }
     }
   }
+  // Setting the QgsProject instance fileName
+  // to help converting relative pathes to absolute
+  if ( mProjectPath != "" )
+  {
+    QgsProject::instance()->setFileName( mProjectPath );
+  }
 }
 
 QgsServerProjectParser::QgsServerProjectParser()
@@ -169,6 +175,8 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&
   QDomElement dataSourceElem = elem.firstChildElement( "datasource" );
   QString uri = dataSourceElem.text();
   QString absoluteUri;
+  // If QgsProject instance fileName is set,
+  // Is converting relative pathes to absolute still relevant ?
   if ( !dataSourceElem.isNull() )
   {
     //convert relative pathes to absolute ones if necessary

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,12 @@ QgsServerProjectParser::QgsServerProjectParser( QDomDocument* xmlDoc, const QStr`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
	`79`	`+ // Setting the QgsProject instance fileName`
	`80`	`+ // to help converting relative pathes to absolute`
	`81`	`+ if ( mProjectPath != "" )`
	`82`	`+ {`
	`83`	`+ QgsProject::instance()->setFileName( mProjectPath );`
	`84`	`+ }`
`79`	`85`	`}`
`80`	`86`
`81`	`87`	`QgsServerProjectParser::QgsServerProjectParser()`
`@@ -169,6 +175,8 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&`
`169`	`175`	`QDomElement dataSourceElem = elem.firstChildElement( "datasource" );`
`170`	`176`	`QString uri = dataSourceElem.text();`
`171`	`177`	`QString absoluteUri;`
	`178`	`+ // If QgsProject instance fileName is set,`
	`179`	`+ // Is converting relative pathes to absolute still relevant ?`
`172`	`180`	`if ( !dataSourceElem.isNull() )`
`173`	`181`	`{`
`174`	`182`	`//convert relative pathes to absolute ones if necessary`