[mapserver-commits] r7680 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-06-14 14:49:39 -0400 (Sat, 14 Jun 2008)
New Revision: 7680

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwfs.c
   trunk/mapserver/mapwfs11.c
Log:
set output GML MIME type correctly


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-14 17:41:11 UTC (rev 7679)
+++ trunk/mapserver/HISTORY.TXT	2008-06-14 18:49:39 UTC (rev 7680)
@@ -13,6 +13,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- mapwfs.c/mapwfs11.c: set GML MIME type correctly
+
 - mapogcsos.c: advertise supported SRS list via
   MAP.WEB.METADATA.sos_srs (#2414)
 

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2008-06-14 17:41:11 UTC (rev 7679)
+++ trunk/mapserver/mapwfs.c	2008-06-14 18:49:39 UTC (rev 7680)
@@ -1125,7 +1125,7 @@
 
             if (szBuf != NULL) {
               if (msLoadProjectionString(&(map->projection), szBuf) != 0) {
-                 msSetError(MS_WFSERR, "msLoadProjectionString() failed2: %s", "msWFSGetFeature()", szBuf);
+                 msSetError(MS_WFSERR, "msLoadProjectionString() failed: %s", "msWFSGetFeature()", szBuf);
                  return msWFSException(map, "mapserv", "NoApplicableCode", paramsObj->pszVersion);
               }
             }
@@ -1171,7 +1171,7 @@
       if(paramsObj->pszVersion == NULL || strncmp(paramsObj->pszVersion,"1.1",3) == 0 )
       {
           outputformat = OWS_GML3;
-          output_schema_format = "text/gml; subtype=gml/3.1.1";
+          output_schema_format = "text/xml; subtype=gml/3.1.1";
       }
   }
   /* else if (strcasecmp(names[i], "PROPERTYNAME") == 0) */

Modified: trunk/mapserver/mapwfs11.c
===================================================================
--- trunk/mapserver/mapwfs11.c	2008-06-14 17:41:11 UTC (rev 7679)
+++ trunk/mapserver/mapwfs11.c	2008-06-14 18:49:39 UTC (rev 7680)
@@ -331,7 +331,7 @@
      /*output format*/
       xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws, 
                                                                   "Parameter", "outputFormat", 
-                                                                  "XMLSCHEMA,text/xml; subtype=gml/2.1.2,text/gml; subtype=gml/3.1.1"));
+                                                                  "XMLSCHEMA,text/xml; subtype=gml/2.1.2,text/xml; subtype=gml/3.1.1"));
 
 /* -------------------------------------------------------------------- */
 /*      GetFeatureType                                                  */
@@ -352,7 +352,7 @@
      */
      xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws, 
                                                                   "Parameter", "outputFormat", 
-                                                                  "text/gml; subtype=gml/3.1.1"));
+                                                                  "text/xml; subtype=gml/3.1.1"));
 
 /* -------------------------------------------------------------------- */
 /*      FeatureTypeList                                                 */