[mapserver-commits] r7467 - trunk/mapserver

[svn at osgeo.org]

Author: Assefa
Date: 2008-03-19 18:51:39 -0400 (Wed, 19 Mar 2008)
New Revision: 7467

Modified:
   trunk/mapserver/mapogcfilter.c
   trunk/mapserver/mapogcfilter.h
   trunk/mapserver/mapogcsos.c
Log:
tempoarl filter capabilities not used for WFS #2547

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2008-03-19 21:09:15 UTC (rev 7466)
+++ trunk/mapserver/mapogcfilter.c	2008-03-19 22:51:39 UTC (rev 7467)
@@ -3802,7 +3802,7 @@
 }
 #ifdef USE_LIBXML2
 
-xmlNodePtr FLTGetCapabilities(xmlNsPtr psNsParent, xmlNsPtr psNsOgc)
+xmlNodePtr FLTGetCapabilities(xmlNsPtr psNsParent, xmlNsPtr psNsOgc, int bTemporal)
 {
     xmlNodePtr psRootNode = NULL, psNode = NULL, psSubNode = NULL, psSubSubNode = NULL;
     
@@ -3836,19 +3836,23 @@
     xmlNewProp(psSubSubNode, BAD_CAST "name", BAD_CAST "Contains");
     psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "SpatialOperator", NULL);
     xmlNewProp(psSubSubNode, BAD_CAST "name", BAD_CAST "DWithin");
+    psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "SpatialOperator", NULL);
+    xmlNewProp(psSubSubNode, BAD_CAST "name", BAD_CAST "Beyond");
 #endif
     psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "SpatialOperator", NULL);
     xmlNewProp(psSubSubNode, BAD_CAST "name", BAD_CAST "BBOX");
 
-    psNode = xmlNewChild(psRootNode, psNsOgc, BAD_CAST "Temporal_Capabilities", NULL);
-    psSubNode = xmlNewChild(psNode, psNsOgc, BAD_CAST "TemporalOperands", NULL);
-    psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "TemporalOperand", BAD_CAST "gml:TimePeriod");
-    psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "TemporalOperand", BAD_CAST "gml:TimeInstant");
+    if (bTemporal)
+    {
+        psNode = xmlNewChild(psRootNode, psNsOgc, BAD_CAST "Temporal_Capabilities", NULL);
+        psSubNode = xmlNewChild(psNode, psNsOgc, BAD_CAST "TemporalOperands", NULL);
+        psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "TemporalOperand", BAD_CAST "gml:TimePeriod");
+        psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "TemporalOperand", BAD_CAST "gml:TimeInstant");
 
-    psSubNode = xmlNewChild(psNode, psNsOgc, BAD_CAST "TemporalOperators", NULL);
-    psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "TemporalOperator", NULL);
-    xmlNewProp(psSubSubNode, BAD_CAST "name", BAD_CAST "TM_Equals");
-
+        psSubNode = xmlNewChild(psNode, psNsOgc, BAD_CAST "TemporalOperators", NULL);
+        psSubSubNode = xmlNewChild(psSubNode, psNsOgc, BAD_CAST "TemporalOperator", NULL);
+        xmlNewProp(psSubSubNode, BAD_CAST "name", BAD_CAST "TM_Equals");
+    }
     psNode = xmlNewChild(psRootNode, psNsOgc, BAD_CAST "Scalar_Capabilities", NULL);
     xmlNewChild(psNode, psNsOgc, BAD_CAST "LogicalOperators", NULL);
     psNode = xmlNewChild(psNode, psNsOgc, BAD_CAST "ComparisonOperators", NULL);

Modified: trunk/mapserver/mapogcfilter.h
===================================================================
--- trunk/mapserver/mapogcfilter.h	2008-03-19 21:09:15 UTC (rev 7466)
+++ trunk/mapserver/mapogcfilter.h	2008-03-19 22:51:39 UTC (rev 7467)
@@ -26,6 +26,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  ****************************************************************************/
 
+#ifndef MAPOGCFILTER_H
+#define MAPOGCFILTER_H
 
 #ifdef USE_OGR
 
@@ -120,7 +122,10 @@
 MS_DLL_EXPORT FilterEncodingNode *FLTCreateFeatureIdFilterEncoding(char *pszString);
 
 #ifdef USE_LIBXML2
-MS_DLL_EXPORT xmlNodePtr FLTGetCapabilities(xmlNsPtr psNsParent, xmlNsPtr psNsOgc);
+MS_DLL_EXPORT xmlNodePtr FLTGetCapabilities(xmlNsPtr psNsParent, xmlNsPtr psNsOgc, int bTemporal);
 #endif
 
 #endif
+
+
+#endif

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2008-03-19 21:09:15 UTC (rev 7466)
+++ trunk/mapserver/mapogcsos.c	2008-03-19 22:51:39 UTC (rev 7467)
@@ -1353,7 +1353,7 @@
     }
 
     /*<ogc:Filter_Capabilities> */
-    psTmpNode = xmlAddChild(psRootNode, FLTGetCapabilities(psNsSos, psNsOgc));
+    psTmpNode = xmlAddChild(psRootNode, FLTGetCapabilities(psNsSos, psNsOgc, MS_TRUE));
 
     /*Offerings */
      psNode = xmlNewChild(psRootNode, NULL, BAD_CAST "Contents", NULL);