Changeset 272

Timestamp:

06/01/10 13:23:43 (20 months ago)

Author:

ol

Message:

Operations tag could not be empty, remove it if needed. Remove REQUEST= in Get Capabilities? output. Remove GML3 and Geo Json? from Get Capabilities? 1.0.0 output (don't validate against WFS XSD Schema). Tks to FX Prunayre for reporting

Files:

• trunk/src/wfs/wfs_get_capabilities.c (modified) (6 diffs)

trunk/src/wfs/wfs_get_capabilities.c

@@ -114 +114 @@
     fprintf(o->output, "        <XMLSCHEMA/>\n");
     fprintf(o->output, "     </SchemaDescriptionLanguage>\n");
-    wfs_get_capabilities_dcpt_100(o, "REQUEST=DescribeFeatureType");
+    wfs_get_capabilities_dcpt_100(o, "");
     fprintf(o->output, "   </DescribeFeatureType>\n");
     fprintf(o->output, "   <GetFeature>\n");
     fprintf(o->output, "<ResultFormat>\n");
     fprintf(o->output, "<GML2/>\n");
-    fprintf(o->output, "<GML3/>\n");
-    fprintf(o->output, "<JSON/>\n");
     fprintf(o->output, "</ResultFormat>\n");
-    wfs_get_capabilities_dcpt_100(o, "REQUEST=GetFeature");
+    wfs_get_capabilities_dcpt_100(o, "");
     fprintf(o->output, "   </GetFeature>\n");
     fprintf(o->output, "   <Transaction>\n");
-    wfs_get_capabilities_dcpt_100(o, "REQUEST=Transaction");
+    wfs_get_capabilities_dcpt_100(o, "");
     fprintf(o->output, "   </Transaction>\n");
     fprintf(o->output, "  </Request>\n");
@@ -160 +158 @@
     fprintf(o->output, "   </ows:Operation>\n");
     fprintf(o->output, "   <ows:Operation name='DescribeFeatureType'>\n");
-    ows_get_capabilities_dcpt(o, "REQUEST=DescribeFeatureType");
+    ows_get_capabilities_dcpt(o, "");
     fprintf(o->output, "  <ows:Parameter name='outputFormat'>\n");
     fprintf(o->output, "  <ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>\n");
@@ -167 +165 @@
     fprintf(o->output, "   </ows:Operation>\n");
     fprintf(o->output, "   <ows:Operation name='GetFeature'>\n");
-    ows_get_capabilities_dcpt(o, "REQUEST=GetFeature");
+    ows_get_capabilities_dcpt(o, "");
     fprintf(o->output, "  <ows:Parameter name='resultType'>\n");
     fprintf(o->output, "  <ows:Value>results</ows:Value>\n");
@@ -179 +177 @@
     fprintf(o->output, "   </ows:Operation>\n");
     fprintf(o->output, "   <ows:Operation name='Transaction'>\n");
-    ows_get_capabilities_dcpt(o, "REQUEST=Transaction");
+    ows_get_capabilities_dcpt(o, "");
     fprintf(o->output, "    <ows:Parameter name='inputFormat'>\n"); 
     fprintf(o->output, "     <ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>\n");
@@ -216 +214 @@
 
     /* print global operations */
-    fprintf(o->output, "  <Operations>\n");
+    
+    if (   ows_layer_list_writable(o->layers)
+        || ows_layer_list_writable(o->layers)) 
+        fprintf(o->output, "  <Operations>\n");
 
     if (ows_layer_list_retrievable(o->layers)) {
@@ -241 +242 @@
     }
 
-    fprintf(o->output, "  </Operations>\n");
+    if (   ows_layer_list_writable(o->layers)
+        || ows_layer_list_writable(o->layers)) 
+        fprintf(o->output, "  </Operations>\n");
 
     for (ln = o->layers->first; ln != NULL; ln = ln->next) {