Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psLib/src/db/psDB.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psLib/src/db/psDB.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/psLib/src/db/psDB.c

@@ -2157 +2157 @@
 
             // scan through the list and change the logicalOp joining
-            // conditionals together to "OR" if a comment of "==" is found
+            // conditionals together to "OR" if a comment of "==" or "LIKE" is found
             psListIterator *mCursor = psListIteratorAlloc(item->data.list, 0,
                                       false);
@@ -2163 +2163 @@
             while ((mItem = psListGetAndIncrement(mCursor))) {
                 if (mItem->comment && psStrcasestr(mItem->comment, "==")) {
+                    logicalOp = "OR";
+                    break;
+                }
+                if (mItem->comment && psStrcasestr(mItem->comment, "LIKE")) {
                     logicalOp = "OR";
                     break;