[mapserver-commits] r9827 - in trunk: mapserver msautotest/wxs/expected

svn at osgeo.org svn at osgeo.org
Sat Feb 20 21:21:23 EST 2010


Author: tomkralidis
Date: 2010-02-20 21:21:23 -0500 (Sat, 20 Feb 2010)
New Revision: 9827

Modified:
   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.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
Log:
s/gml:null/gml:Null for empty WFS GetFeature responses (#3299)


Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2010-02-20 22:32:33 UTC (rev 9826)
+++ trunk/mapserver/mapwfs.c	2010-02-21 02:21:23 UTC (rev 9827)
@@ -1991,7 +1991,7 @@
     
     if (((iNumberOfFeatures==0) || (maxfeatures == 0)) && iResultTypeHits == 0) {
       msIO_printf("   <gml:boundedBy>\n"); 
-      msIO_printf("      <gml:null>missing</gml:null>\n");
+      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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_crosses.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=province&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_contains.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=province&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_crosses.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=province&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_dwithin.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=popplace&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=popplace&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_equals_poly.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=province&amp;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.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_projmeter_intersects.xml	2010-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_intersects.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=popplace&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_intersects_line.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=province&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_overlaps.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=province&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_touches.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=province&amp;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-02-20 22:32:33 UTC (rev 9826)
+++ trunk/msautotest/wxs/expected/wfs_filter_projmeter_within.xml	2010-02-21 02:21:23 UTC (rev 9827)
@@ -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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=province&amp;OUTPUTFORMAT=XMLSCHEMA">
    <gml:boundedBy>
-      <gml:null>missing</gml:null>
+      <gml:Null>missing</gml:Null>
    </gml:boundedBy>
 </wfs:FeatureCollection>
 



More information about the mapserver-commits mailing list