Imported Upstream version 0.8~alpha1

[platform/upstream/syncevolution.git] / src / client-api / src / c++ / common / filter / ClauseUtil.cpp

diff --git a/src/client-api/src/c++/common/filter/ClauseUtil.cpp b/src/client-api/src/c++/common/filter/ClauseUtil.cpp
index 0012393..882d0fb 100644 (file)
--- a/src/client-api/src/c++/common/filter/ClauseUtil.cpp
+++ b/src/client-api/src/c++/common/filter/ClauseUtil.cpp
@@ -46,6 +46,9 @@
 #include "filter/WhereClause.h"
 #include "syncml/core/Property.h"
 #include "syncml/core/PropParam.h"
+#include "base/globalsdef.h"
+
+USE_NAMESPACE
 
 
 /**
@@ -57,23 +60,22 @@
  *
  * @return the corresponding CGI query string
  */
-const char* ClauseUtil::toCGIQuery(Clause& clause) {
+char* ClauseUtil::toCGIQuery(Clause& clause) {
     StringBuffer query;
 
-    ArrayList* operands = NULL;
-    WhereClause* where = NULL;
+    ArrayList operands;
+    WhereClause* whereClause = NULL;
 
     if (clause.type == WHERE_CLAUSE) {
-        operands = new ArrayList();
-        operands->add(clause);
+        operands.add(clause);
     } else {
-        operands = ((LogicalClause*)&clause)->getOperands();
+               operands = *((LogicalClause&)clause).getOperands();
     }
 
-    for (int i=0; i<operands->size(); ++i) {
-        where = (WhereClause*)operands->get(i);
+    for (int i=0; i<operands.size(); ++i) {
+        whereClause = (WhereClause*)operands.get(i);
         if (i) {
-            switch (((LogicalClause*)&clause)->getOperator()) {
+            switch (((LogicalClause&)clause).getOperator()) {
                 case AND:
                     query.append("&AND;");
                     break;
@@ -82,70 +84,68 @@ const char* ClauseUtil::toCGIQuery(Clause& clause) {
                     break;
             }
         }
-        query.append(where->getProperty());
-        switch (where->getOperator()) {
+        query.append(whereClause->getProperty());
+        switch (whereClause->getOperator()) {
             case EQ:
-                if (where->isCaseSensitive()) {
+                if (whereClause->isCaseSensitive()) {
                     query.append("&EQ;");
                 } else {
                     query.append("&iEQ;");
                 }
                 break;
             case NE:
-                if (where->isCaseSensitive()) {
+                if (whereClause->isCaseSensitive()) {
                     query.append("&NE;");
                 } else {
                     query.append("&iNE;");
                 }
                 break;
             case LT:
-                if (where->isCaseSensitive()) {
+                if (whereClause->isCaseSensitive()) {
                     query.append("&LT;");
                 } else {
                     query.append("&iLT;");
                 }
                 break;
             case GT:
-                if (where->isCaseSensitive()) {
+                if (whereClause->isCaseSensitive()) {
                     query.append("&GT;");
                 } else {
                     query.append("&iGT;");
                 }
                 break;
             case LE:
-                if (where->isCaseSensitive()) {
+                if (whereClause->isCaseSensitive()) {
                     query.append("&LE;");
                 } else {
                     query.append("&iLE;");
                 }
                 break;
             case GE:
-                if (where->isCaseSensitive()) {
+                if (whereClause->isCaseSensitive()) {
                     query.append("&GE;");
                 } else {
                     query.append("&iGE;");
                 }
                 break;
             case CONTAIN:
-                if (where->isCaseSensitive()) {
+                if (whereClause->isCaseSensitive()) {
                     query.append("&CON;");
                 } else {
                     query.append("&iCON;");
                 }
                 break;
             case NCONTAIN:
-                if (where->isCaseSensitive()) {
+                if (whereClause->isCaseSensitive()) {
                     query.append("&NCON;");
                 } else {
                     query.append("&iNCON;");
                 }
                 break;
         }
-        query.append(where->getValue());
+        query.append(whereClause->getValue());
     }
 
-    delete operands; operands = NULL;
-
     return stringdup(query.c_str());
 }
 
@@ -182,6 +182,8 @@ Filter* ClauseUtil::toFilter(SourceFilter& sourceFilter) {
         return NULL;
     }
 
+
+
     //
     // The first operand must be a FieldClause or AllClause
     //
@@ -240,7 +242,8 @@ Filter* ClauseUtil::toFilter(SourceFilter& sourceFilter) {
         ComplexData recordData;
 
         recordMeta.setType("syncml:filtertype-cgi");
-        char* query = (char*)toCGIQuery(*recordClause);
+               
+               char* query = toCGIQuery(*recordClause);
         recordData.setData(query);
         safeDelete(&query);
 
@@ -415,7 +418,7 @@ SourceFilter* ClauseUtil::createSourceFilter(const WCHAR* since, int bodySize, i
     //
     if (since) {
         char *s = toMultibyte(since);
-        WhereClause recordClause("modified", s, GE, FALSE);
+        WhereClause recordClause("modified", s, GE, false);
         operands.add(recordClause);
         delete [] s;
     } else {
@@ -479,7 +482,7 @@ SourceFilter* ClauseUtil::createSourceFilterInclusive(const char* luid, int size
     //
 
     if (luid) {
-        WhereClause recordClause("&LUID", luid, EQ, FALSE);
+        WhereClause recordClause("&LUID", luid, EQ, false);
         operands.add(recordClause);
     } else {
         AllClause all;
@@ -490,7 +493,7 @@ SourceFilter* ClauseUtil::createSourceFilterInclusive(const char* luid, int size
 
     SourceFilter* filter = new SourceFilter();
     filter->setClause(clause);
-    filter->setInclusive(TRUE);
+    filter->setInclusive(true);
 
     return filter;
 }