[fdo-commits] r2676 - trunk/Providers/SDF/Src/Utils

[svn_fdo at osgeo.org]

Author: badreddinekaroui
Date: 2007-03-09 14:52:13 -0500 (Fri, 09 Mar 2007)
New Revision: 2676

Modified:
   trunk/Providers/SDF/Src/Utils/FilterExecutor.cpp
Log:
Merge ticket#25 fix from branch 2.1.x to the trunk

Modified: trunk/Providers/SDF/Src/Utils/FilterExecutor.cpp
===================================================================
--- trunk/Providers/SDF/Src/Utils/FilterExecutor.cpp	2007-03-09 19:40:46 UTC (rev 2675)
+++ trunk/Providers/SDF/Src/Utils/FilterExecutor.cpp	2007-03-09 19:52:13 UTC (rev 2676)
@@ -342,7 +342,6 @@
 void FilterExecutor::ProcessDistanceCondition(FdoDistanceCondition& filter)
 {
     //TODO:
-    printf("distance condition\n");
     throw FdoException::Create(L"DISTANCE condition not supported");
 }
 
@@ -801,7 +800,7 @@
 void FilterExecutor::ProcessGeometryValue(FdoGeometryValue& expr)
 {
     //m_tokens.push(new GeometryVal());
-    printf("geometry value\n");
+    throw FdoException::Create(L"Geometry not supported");
 }
 
 
@@ -840,7 +839,7 @@
     {
         bMatches = MatchBracket(pattern+1, src);
     }
-	else if(*src != L'\0' && ((*pattern == L'_') || _wcsnicmp(pattern, src, 1) == 0))
+	else if(*src != L'\0' && ((*pattern == L'_') || wcsncmp(pattern, src, 1) == 0))
 	{
 		bMatches = MatchesHere(pattern+1, src+1);
 	}
@@ -937,7 +936,7 @@
     for (unsigned i=0; i<set.size(); i++)
     {
         wchar_t current = set[i];
-        if (_wcsnicmp(&current, &srcchar, 1) == 0)
+        if (wcsncmp(&current, &srcchar, 1) == 0)
         {
             isthere = true;
             break;