[mapserver-commits] r10158 - in trunk: mapserver
msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Fri May 14 14:17:28 EDT 2010
Author: tomkralidis
Date: 2010-05-14 14:17:27 -0400 (Fri, 14 May 2010)
New Revision: 10158
Modified:
trunk/mapserver/HISTORY.TXT
trunk/mapserver/mapwfs.c
trunk/msautotest/wxs/expected/wfs_filter_crosses.xml
trunk/msautotest/wxs/expected/wfs_filter_isequalto_and_isequalto.xml
trunk/msautotest/wxs/expected/wfs_filter_isequalto_and_isequalto_reverse.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_contains.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_crosses.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_dwithin.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals_poly.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_intersects_line.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_overlaps.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_touches.xml
trunk/msautotest/wxs/expected/wfs_filter_projmeter_within.xml
trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames1.xml
Log:
Handle null results with gml:Null/gml:null according to version (#3299)
Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/mapserver/HISTORY.TXT 2010-05-14 18:17:27 UTC (rev 10158)
@@ -14,6 +14,8 @@
Current Version (SVN trunk):
----------------------------
+- Handle null results with gml:Null/gml:null according to version (#3299)
+
- Reworked mapfile writing to use helper functions so that core types (e.g. numbers, strings,
colors, keywords, etc...) are always written consistently.
Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/mapserver/mapwfs.c 2010-05-14 18:17:27 UTC (rev 10158)
@@ -2225,7 +2225,10 @@
if (((iNumberOfFeatures==0) || (maxfeatures == 0)) && iResultTypeHits == 0) {
msIO_printf(" <gml:boundedBy>\n");
- msIO_printf(" <gml:Null>missing</gml:Null>\n");
+ if(outputformat == OWS_GML3)
+ msIO_printf(" <gml:Null>missing</gml:Null>\n");
+ else
+ msIO_printf(" <gml:null>missing</gml:null>\n");
msIO_printf(" </gml:boundedBy>\n");
}
Modified: trunk/msautotest/wxs/expected/wfs_filter_crosses.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_crosses.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_crosses.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_isequalto_and_isequalto.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_filter_isequalto_and_isequalto_reverse.xml
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_contains.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_contains.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_contains.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_crosses.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_crosses.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_crosses.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_dwithin.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_dwithin.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_dwithin.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=popplace&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=popplace&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals_poly.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals_poly.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals_poly.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_intersects_line.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_intersects_line.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_intersects_line.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_overlaps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_overlaps.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_overlaps.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_touches.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_touches.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_touches.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_projmeter_within.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_within.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_within.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Null>missing</gml:Null>
+ <gml:null>missing</gml:null>
</gml:boundedBy>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames1.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames1.xml 2010-05-14 18:14:42 UTC (rev 10157)
+++ trunk/msautotest/wxs/expected/wfs_getfeature_twotypenames1.xml 2010-05-14 18:17:27 UTC (rev 10158)
@@ -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" 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; subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd" timeStamp="2010-05-14T13:58:16" numberOfFeatures="49">
</wfs:FeatureCollection>
More information about the mapserver-commits
mailing list