[mapserver-commits] r9795 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-02-16 21:37:59 -0500 (Tue, 16 Feb 2010)
New Revision: 9795

Modified:
   trunk/mapserver/mapwfs.c
Log:
Correct mimetype for DescribeFeature #3294

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2010-02-16 16:52:45 UTC (rev 9794)
+++ trunk/mapserver/mapwfs.c	2010-02-17 02:37:59 UTC (rev 9795)
@@ -740,13 +740,7 @@
     }
   } 
 
-  /*set the output format to gml3 for wfs1.1*/
-  if(paramsObj->pszVersion == NULL || strncmp(paramsObj->pszVersion,"1.1",3) == 0 )
-  {
-      mimetype = msEncodeHTMLEntities("text/xml; subtype=gml/3.1.1");
-      outputformat = OWS_SFE_SCHEMA;
-  }
-
+  
   if (paramsObj->pszOutputFormat) {
     if(strcasecmp(paramsObj->pszOutputFormat, "XMLSCHEMA") == 0 ||
        strstr(paramsObj->pszOutputFormat, "gml/2")!= NULL)
@@ -766,6 +760,18 @@
     }
   }
 
+  /*set the output format to gml3 for wfs1.1*/
+  if(mimetype == NULL)
+  {
+      if (paramsObj->pszVersion == NULL || strncmp(paramsObj->pszVersion,"1.1",3) == 0 )
+      {
+          mimetype = msEncodeHTMLEntities("text/xml; subtype=gml/3.1.1");
+          outputformat = OWS_SFE_SCHEMA;
+      }
+      else
+        mimetype = msEncodeHTMLEntities("text/xml");
+  }
+
   /* Validate layers */
   if (numlayers > 0) {
     for (i=0; i<numlayers; i++) {