Merge pull request #5145 from pblottiere/bugfix_ogc_getcapa_schemalocation

pblottiere · web-flow · commit 217c0e799aad · 2017-10-10T09:20:26.000+01:00
[server][bugfix] Fix OGC test getcapabilities:validate-using-schemaLocation
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/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -4,3 +4,7 @@ INSTALL(FILES qgis_global_settings.ini
         DESTINATION ${QGIS_DATA_DIR})
 INSTALL(DIRECTORY cpt-city-qgis-min DESTINATION ${QGIS_DATA_DIR}/resources)
 INSTALL(DIRECTORY themes DESTINATION ${QGIS_DATA_DIR}/resources)
+
+IF (WITH_SERVER)
+        INSTALL(DIRECTORY server DESTINATION ${QGIS_DATA_DIR}/resources)
+ENDIF (WITH_SERVER)
diff --git a/resources/server/schemaExtension.xsd b/resources/server/schemaExtension.xsd
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/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -203,6 +203,5 @@ INSTALL(TARGETS
 INSTALL(FILES
   admin.sld
   wms_metadata.xml
-  schemaExtension.xsd
   DESTINATION ${QGIS_CGIBIN_DIR}
 )
diff --git a/src/server/services/wms/qgswmsgetschemaextension.cpp b/src/server/services/wms/qgswmsgetschemaextension.cpp
@@ -20,7 +20,9 @@
  ***************************************************************************/
 #include "qgswmsutils.h"
 #include "qgswmsgetschemaextension.h"
+#include "qgsapplication.h"
 
+#include <QDir>
 #include <QFileInfo>
 
 namespace QgsWms
@@ -44,7 +46,9 @@ namespace QgsWms
 
     QDomDocument xsdDoc;
 
-    QFileInfo xsdFileInfo( QStringLiteral( "schemaExtension.xsd" ) );
+    QDir resourcesDir = QFileInfo( QgsApplication::serverResourcesPath() ).absoluteDir();
+    QFileInfo xsdFileInfo( resourcesDir, QStringLiteral( "schemaExtension.xsd" ) );
+
     if ( !xsdFileInfo.exists() )
     {
       QgsMessageLog::logMessage( QStringLiteral( "Error, xsd file 'schemaExtension.xsd' does not exist" ),
diff --git a/tests/src/python/test_qgsserver_wms.py b/tests/src/python/test_qgsserver_wms.py
@@ -184,6 +184,11 @@ def test_project_wms(self):
                                  '&layers=testlayer%20%C3%A8%C3%A9&',
                                  'getstyles')
 
+    def test_wms_getschemaextension(self):
+        self.wms_request_compare('GetSchemaExtension',
+                                 '',
+                                 'getschemaextension')
+
     def wms_inspire_request_compare(self, request):
         """WMS INSPIRE tests"""
         project = self.testdata_path + "test_project_inspire.qgs"
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
`@@ -203,6 +203,5 @@ INSTALL(TARGETS`
`203`	`203`	`INSTALL(FILES`
`204`	`204`	`admin.sld`
`205`	`205`	`wms_metadata.xml`
`206`		`- schemaExtension.xsd`
`207`	`206`	`DESTINATION ${QGIS_CGIBIN_DIR}`
`208`	`207`	`)`