Merge branch 'mapserverexport' of https://github.com/rduivenvoorde/Qu…

…antum-GIS
qgis · Oct 5, 2012 · 21eb6cf · 21eb6cf
2 parents 7ed05a2 + 372e520
commit 21eb6cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/python/plugins/mapserver_export/__init__.py b/python/plugins/mapserver_export/__init__.py
@@ -26,7 +26,7 @@ def description():
 def category():
   return "Web"
 def version():
-  return "Version 0.4.3"
+  return "Version 0.4.4"
 def qgisMinimumVersion():
   return "1.0"
 def icon():

diff --git a/python/plugins/mapserver_export/ms_export.py b/python/plugins/mapserver_export/ms_export.py
@@ -283,10 +283,10 @@ def writeMapSection(self):
     self.outFile.write("\n")
     # extents
     self.outFile.write(self.getExtentString())
-
-    self.outFile.write("  FONTSET '" + self.fontsPath + "'\n")
+    # put FONTSET and SYMBOLSET in comments to make it work out of the box for beginners
+    self.outFile.write("  #FONTSET '" + self.fontsPath + "'\n")
     # use of external symbol set
-    self.outFile.write("  SYMBOLSET '" + self.symbolsPath + "'\n")
+    self.outFile.write("  #SYMBOLSET '" + self.symbolsPath + "'\n")
 
   def getExtentString(self):
     stringToAddTo = ""
@@ -404,6 +404,9 @@ def writeWebSection(self):
             "'?\n  Be sure there is a valid mapserverurl in the 'ows_onlineresource'.\n"
     self.outFile.write("      'ows_onlineresource'  '" + self.mapServerUrl + "?" + "map" + "=" + self.mapFile + "'\n")
     self.outFile.write("      'ows_srs'             'EPSG:" + epsg + "'\n")
+    # enable all layers for ows requests to work for mapserver 6.x
+    self.outFile.write("      'ows_enable_request'  '*'\n")
+
     self.outFile.write("    END\n\n")
 
     self.outFile.write("    #Scale range at which web interface will operate\n")