[fdo-commits] r211 - branches/3.2.x/Providers/SDF/Src/Provider

[svn_fdo at osgeo.org]

Author: danstoica
Date: 2007-02-14 18:57:25 -0500 (Wed, 14 Feb 2007)
New Revision: 211

Modified:
   branches/3.2.x/Providers/SDF/Src/Provider/SdfDelete.cpp
   branches/3.2.x/Providers/SDF/Src/Provider/SdfSelect.cpp
   branches/3.2.x/Providers/SDF/Src/Provider/SdfUpdate.cpp
Log:
Validate spatial operators in the filter at Execute() time.

Modified: branches/3.2.x/Providers/SDF/Src/Provider/SdfDelete.cpp
===================================================================
--- branches/3.2.x/Providers/SDF/Src/Provider/SdfDelete.cpp	2007-02-14 21:59:15 UTC (rev 210)
+++ branches/3.2.x/Providers/SDF/Src/Provider/SdfDelete.cpp	2007-02-14 23:57:25 UTC (rev 211)
@@ -73,8 +73,12 @@
         m_connection->GetSchema()->GetClasses())->FindItem(m_className->GetName());
     if( clas == NULL )
         throw FdoException::Create(NlsMsgGetMain(FDO_NLSID(SDFPROVIDER_75_CLASS_NOTFOUND), m_className->GetName()));
+
     if( m_filter != NULL )
-        FdoCommonFilterExecutor::ValidateFilter( clas, m_filter );
+	{
+		FdoPtr<FdoIFilterCapabilities> filterCaps = m_connection->GetFilterCapabilities();
+        FdoCommonFilterExecutor::ValidateFilter( clas, m_filter, NULL, filterCaps );
+	}
 
 	m_connection->FlushAll( clas, true );
 

Modified: branches/3.2.x/Providers/SDF/Src/Provider/SdfSelect.cpp
===================================================================
--- branches/3.2.x/Providers/SDF/Src/Provider/SdfSelect.cpp	2007-02-14 21:59:15 UTC (rev 210)
+++ branches/3.2.x/Providers/SDF/Src/Provider/SdfSelect.cpp	2007-02-14 23:57:25 UTC (rev 211)
@@ -118,8 +118,12 @@
         throw FdoException::Create(NlsMsgGetMain(FDO_NLSID(SDFPROVIDER_75_CLASS_NOTFOUND), m_className->GetName()));
     
     if( m_filter != NULL )
-        FdoCommonFilterExecutor::ValidateFilter( clas, m_filter, m_properties );
+	{
+		FdoPtr<FdoIFilterCapabilities> filterCaps = m_connection->GetFilterCapabilities();
 
+        FdoCommonFilterExecutor::ValidateFilter( clas, m_filter, m_properties, filterCaps );
+	}
+
     //get the R-Tree for this feature class... 
     SdfRTree* rt = m_connection->GetRTree(clas);
     recno_list* features = NULL;

Modified: branches/3.2.x/Providers/SDF/Src/Provider/SdfUpdate.cpp
===================================================================
--- branches/3.2.x/Providers/SDF/Src/Provider/SdfUpdate.cpp	2007-02-14 21:59:15 UTC (rev 210)
+++ branches/3.2.x/Providers/SDF/Src/Provider/SdfUpdate.cpp	2007-02-14 23:57:25 UTC (rev 211)
@@ -85,8 +85,10 @@
         throw FdoException::Create(NlsMsgGetMain(FDO_NLSID(SDFPROVIDER_75_CLASS_NOTFOUND), m_className->GetName()));
 
     if( m_filter != NULL )
-        FdoCommonFilterExecutor::ValidateFilter( clas, m_filter );
-
+	{
+		FdoPtr<FdoIFilterCapabilities> filterCaps = m_connection->GetFilterCapabilities();
+        FdoCommonFilterExecutor::ValidateFilter( clas, m_filter, NULL, filterCaps );
+	}
 	m_connection->FlushAll( clas, true );