[mapserver-commits] r11174 - in trunk: mapserver
msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Wed Mar 16 12:34:45 EDT 2011
Author: tomkralidis
Date: 2011-03-16 09:34:45 -0700 (Wed, 16 Mar 2011)
New Revision: 11174
Modified:
trunk/mapserver/mapwfs.c
trunk/msautotest/wxs/expected/wfs11_get_feature.xml
trunk/msautotest/wxs/expected/wfs11_get_feature_hits.xml
trunk/msautotest/wxs/expected/wfs11_get_feature_id.xml
trunk/msautotest/wxs/expected/wfs11_get_feature_maxfeatures.xml
trunk/msautotest/wxs/expected/wfs11_get_feature_srsname.xml
trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames1.xml
trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames2.xml
Log:
fix schemaLocation attribute for WFS GetFeature (#3447)
Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c 2011-03-16 15:29:19 UTC (rev 11173)
+++ trunk/mapserver/mapwfs.c 2011-03-16 16:34:45 UTC (rev 11174)
@@ -2004,7 +2004,7 @@
if(paramsObj->pszVersion == NULL || strncmp(paramsObj->pszVersion,"1.1",3) == 0 )
{
outputformat = OWS_GML3;
- gmlinfo.output_schema_format = "text/xml; subtype=gml/3.1.1";
+ gmlinfo.output_schema_format = "text/xml;%20subtype=gml/3.1.1";
output_mime_type = "text/xml; subtype=gml/3.1.1";
}
}
Modified: trunk/msautotest/wxs/expected/wfs11_get_feature.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_get_feature.xml 2011-03-16 15:29:19 UTC (rev 11173)
+++ trunk/msautotest/wxs/expected/wfs11_get_feature.xml 2011-03-16 16:34:45 UTC (rev 11174)
@@ -7,7 +7,7 @@
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml; subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+ xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<gml:boundedBy>
<gml:Envelope srsName="EPSG:4326">
<gml:lowerCorner>43.412311 -66.432672</gml:lowerCorner>
Modified: trunk/msautotest/wxs/expected/wfs11_get_feature_hits.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_get_feature_hits.xml 2011-03-16 15:29:19 UTC (rev 11173)
+++ trunk/msautotest/wxs/expected/wfs11_get_feature_hits.xml 2011-03-16 16:34:45 UTC (rev 11174)
@@ -7,6 +7,6 @@
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml; subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd" timeStamp="" numberOfFeatures="21">
+ xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd" timeStamp="" numberOfFeatures="21">
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs11_get_feature_id.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_get_feature_id.xml 2011-03-16 15:29:19 UTC (rev 11173)
+++ trunk/msautotest/wxs/expected/wfs11_get_feature_id.xml 2011-03-16 16:34:45 UTC (rev 11174)
@@ -7,7 +7,7 @@
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml; subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+ xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<gml:boundedBy>
<gml:Envelope srsName="EPSG:4326">
<gml:lowerCorner>47.191069 -62.076968</gml:lowerCorner>
Modified: trunk/msautotest/wxs/expected/wfs11_get_feature_maxfeatures.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_get_feature_maxfeatures.xml 2011-03-16 15:29:19 UTC (rev 11173)
+++ trunk/msautotest/wxs/expected/wfs11_get_feature_maxfeatures.xml 2011-03-16 16:34:45 UTC (rev 11174)
@@ -7,7 +7,7 @@
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml; subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+ xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<gml:boundedBy>
<gml:Envelope srsName="EPSG:4326">
<gml:lowerCorner>43.412311 -66.432672</gml:lowerCorner>
Modified: trunk/msautotest/wxs/expected/wfs11_get_feature_srsname.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_get_feature_srsname.xml 2011-03-16 15:29:19 UTC (rev 11173)
+++ trunk/msautotest/wxs/expected/wfs11_get_feature_srsname.xml 2011-03-16 16:34:45 UTC (rev 11174)
@@ -7,7 +7,7 @@
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml; subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+ xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<gml:boundedBy>
<gml:Envelope srsName="EPSG:4326">
<gml:lowerCorner>43.412311 -66.432672</gml:lowerCorner>
Modified: trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames1.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames1.xml 2011-03-16 15:29:19 UTC (rev 11173)
+++ trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames1.xml 2011-03-16 16:34:45 UTC (rev 11174)
@@ -7,6 +7,6 @@
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province,popplace&OUTPUTFORMAT=text/xml; subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd" timeStamp="" numberOfFeatures="49">
+ xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=province,popplace&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd" timeStamp="" numberOfFeatures="49">
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames2.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames2.xml 2011-03-16 15:29:19 UTC (rev 11173)
+++ trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames2.xml 2011-03-16 16:34:45 UTC (rev 11174)
@@ -7,6 +7,6 @@
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=popplace,province&OUTPUTFORMAT=text/xml; subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd" timeStamp="" numberOfFeatures="49">
+ xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=popplace,province&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd" timeStamp="" numberOfFeatures="49">
</wfs:FeatureCollection>
More information about the mapserver-commits
mailing list