[mapguide-commits] r5373 - trunk/MgDev/Server/src/Wfs

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2010-11-05 01:34:47 -0700 (Fri, 05 Nov 2010)
New Revision: 5373

Modified:
   trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd
Log:
Ticket #1517 WFS 1.0.0 with multiple feature classes published by MapGuide can't be consumed

DescribeFeature.EnumDelim.xml and DescribeFeature.EnumFeature.xml in wfs 1.0.0 template file 1.0.0.xml.awd should be updated by specifing a version 1.0.0. 

 <Define item="DescribeFeature.EnumDelim.xml">
   <!-- &Enum.iteration; -->
   <xs:import schemaLocation="&Url.DescribeFeatureType;?request=DescribeFeatureType&amp;service=WFS&amp;version=1.0.0&amp;typeName=&Enum.item;"/>

 </Define>
 <Define item="DescribeFeature.EnumFeature.xml">
   <!-- &Feature.iteration; -->
   <xs:import schemaLocation="&Url.DescribeFeatureType;?request=DescribeFeatureType&amp;service=WFS&amp;version=1.0.0&amp;typeName=&Feature.FullName;"/>
 </Define>
I also correct the output format for GetFeature response for WFS 1.0.0 

<Response request="GetFeature" content-type="text/xml; subtype=gml/2.1.2">
 <?GetFeatureCollection using="&GetFeatureCollection.xml;" ?>
</Response>

 <Define item="GetFeatureCollection.xml">
   <wfs:FeatureCollection &FeatureCollection.Namespaces;>
     <?EnumFeatures using="&GetFeature.xml;" ?> 
   </wfs:FeatureCollection>
 </Define>


Modified: trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd	2010-11-05 06:41:39 UTC (rev 5372)
+++ trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd	2010-11-05 08:34:47 UTC (rev 5373)
@@ -98,17 +98,17 @@
  <Define item="GeometryOperands.xml"><ogc:GeometryOperand>&Enum.item;</ogc:GeometryOperand></Define>
  <Define item="SpatialOperators.xml"><ogc:SpatialOperator name="&Enum.item;"/></Define>
  <Define item="ComparisonOperators.xml"><ogc:ComparisonOperator>&Enum.item;</ogc:ComparisonOperator></Define>
- <Define item="FunctionNames.xml"><ogc:FunctionName nArgs="&Enum.item.args;">&Enum.item;</ogc:FunctionName></Define>
+ <Define item="FunctionNames.xml"><ogc:Function_Name nArgs="&Enum.item.args;">&Enum.item;</ogc:Function_Name></Define>
  <Define item="OtherSRS.xml"><wfs:OtherSRS>&Enum.item;</wfs:OtherSRS></Define>
  <Define item="Format.xml"><ows:Format>&Enum.item;</ows:Format></Define>
 
  <Define item="DescribeFeature.EnumDelim.xml">
    <!-- &Enum.iteration; -->
-   <xs:import schemaLocation="&Url.DescribeFeatureType;?request=DescribeFeatureType&amp;service=WFS&amp;typeName=&Enum.item;"/>
+   <xs:import schemaLocation="&Url.DescribeFeatureType;?request=DescribeFeatureType&amp;service=WFS&amp;version=1.0.0&amp;typeName=&Enum.item;"/>
  </Define>
  <Define item="DescribeFeature.EnumFeature.xml">
    <!-- &Feature.iteration; -->
-   <xs:import schemaLocation="&Url.DescribeFeatureType;?request=DescribeFeatureType&amp;service=WFS&amp;typeName=&Feature.FullName;"/>
+   <xs:import schemaLocation="&Url.DescribeFeatureType;?request=DescribeFeatureType&amp;service=WFS&amp;version=1.0.0&amp;typeName=&Feature.FullName;"/>
  </Define>
 
  <Define item="Format.OgcElement">
@@ -120,6 +120,11 @@
    &Feature.OuterXml;
  </Define>
 
+ <Define item="GetFeatureCollection.xml">
+   <wfs:FeatureCollection &FeatureCollection.Namespaces;>
+     <?EnumFeatures using="&GetFeature.xml;" ?> 
+   </wfs:FeatureCollection>
+ </Define>
 </Definitions>
 
 <!--
@@ -254,9 +259,7 @@
 
 -->
 <Response request="GetFeature" content-type="text/xml; subtype=gml/2.1.2">
- <wfs:FeatureCollection xmlns:gml="http://www.opengis.net/gml" xmlns:wfs="http://www.opengis.net/wfs">
-  <?EnumFeatures using="&GetFeature.xml;" ?>
- </wfs:FeatureCollection>
+ <?GetFeatureCollection using="&GetFeatureCollection.xml;" ?>
 </Response>
 
 <!--