Search schemaExtension.xsd in share directory

pblottiere · pblottiere · commit a9a2c200e3b4 · 2017-10-10T08:02:33.000+01:00
diff --git a/python/core/qgsapplication.sip b/python/core/qgsapplication.sip
@@ -210,6 +210,12 @@ Returns the path to the donors file.
  :rtype: str
 %End
 
+    static QString serverResourcesPath();
+%Docstring
+Returns the path to the server resources directory.
+ :rtype: str
+%End
+
     static QString translatorsFilePath();
 %Docstring
  Returns the path to the sponsors file.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -846,6 +846,11 @@ QString QgsApplication::defaultThemesFolder()
   return ABISYM( mPkgDataPath ) + QStringLiteral( "/resources/themes" );
 }
 
+QString QgsApplication::serverResourcesPath()
+{
+  return ABISYM( mPkgDataPath ) + QStringLiteral( "/resources/server/" );
+}
+
 QString QgsApplication::libraryPath()
 {
   return ABISYM( mLibraryPath );
diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -231,6 +231,9 @@ class CORE_EXPORT QgsApplication : public QApplication
     //! Returns the path to the donors file.
     static QString donorsFilePath();
 
+    //! Returns the path to the server resources directory.
+    static QString serverResourcesPath();
+
     /**
      * Returns the path to the sponsors file.
      */
diff --git a/src/server/services/wms/qgswmsgetschemaextension.cpp b/src/server/services/wms/qgswmsgetschemaextension.cpp
@@ -46,8 +46,8 @@ namespace QgsWms
 
     QDomDocument xsdDoc;
 
-    QDir fcgiBinDir = QFileInfo( QCoreApplication::applicationFilePath() ).absoluteDir();
-    QFileInfo xsdFileInfo( fcgiBinDir, QStringLiteral( "schemaExtension.xsd" ) );
+    QDir resourcesDir = QFileInfo( QgsApplication::serverResourcesPath() ).absoluteDir();
+    QFileInfo xsdFileInfo( resourcesDir, QStringLiteral( "schemaExtension.xsd" ) );
 
     if ( !xsdFileInfo.exists() )
     {
diff --git a/tests/testdata/qgis_server/getschemaextension.txt b/tests/testdata/qgis_server/getschemaextension.txt
@@ -0,0 +1,9 @@
+*****
+Content-Type: text/xml; charset=utf-8
+
+<?xml version='1.0' encoding='UTF-8'?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.qgis.org/wms" elementFormDefault="qualified" version="1.0.0">
+ <import xmlns="http://www.w3.org/2001/XMLSchema" namespace="http://www.opengis.net/wms" schemaLocation="http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd"/>
+ <element xmlns="http://www.w3.org/2001/XMLSchema" name="GetPrint" substitutionGroup="wms:_ExtendedOperation" type="wms:OperationType"/>
+ <element xmlns="http://www.w3.org/2001/XMLSchema" name="GetStyles" substitutionGroup="wms:_ExtendedOperation" type="wms:OperationType"/>
+</schema>

Original file line number	Diff line number	Diff line change
`@@ -846,6 +846,11 @@ QString QgsApplication::defaultThemesFolder()`
`846`	`846`	`return ABISYM( mPkgDataPath ) + QStringLiteral( "/resources/themes" );`
`847`	`847`	`}`
`848`	`848`
	`849`	`+QString QgsApplication::serverResourcesPath()`
	`850`	`+{`
	`851`	`+ return ABISYM( mPkgDataPath ) + QStringLiteral( "/resources/server/" );`
	`852`	`+}`
	`853`	`+`
`849`	`854`	`QString QgsApplication::libraryPath()`
`850`	`855`	`{`
`851`	`856`	`return ABISYM( mLibraryPath );`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ namespace QgsWms`
`46`	`46`
`47`	`47`	`QDomDocument xsdDoc;`
`48`	`48`
`49`		`- QDir fcgiBinDir = QFileInfo( QCoreApplication::applicationFilePath() ).absoluteDir();`
`50`		`- QFileInfo xsdFileInfo( fcgiBinDir, QStringLiteral( "schemaExtension.xsd" ) );`
	`49`	`+ QDir resourcesDir = QFileInfo( QgsApplication::serverResourcesPath() ).absoluteDir();`
	`50`	`+ QFileInfo xsdFileInfo( resourcesDir, QStringLiteral( "schemaExtension.xsd" ) );`
`51`	`51`
`52`	`52`	`if ( !xsdFileInfo.exists() )`
`53`	`53`	`{`