Changeset 17853

Timestamp:

May 29, 2008, 11:05:50 AM (18 years ago)

Author:

jhoblitt

Message:

attempt to make INDEX work again

File:

• trunk/psLib/src/db/psDB.c (modified) (4 diffs)

trunk/psLib/src/db/psDB.c

@@ -23 +23 @@
  * 4.1.2 or newer is required.
  *
- * $Id: psDB.c,v 1.157 2008-05-29 03:02:28 jhoblitt Exp $
+ * $Id: psDB.c,v 1.158 2008-05-29 21:05:50 jhoblitt Exp $
  */
 
@@ -1647 +1647 @@
     while ((item = psListGetAndIncrement(cursor))) {
         // don't compile a regex unless we have too
-        if (psStrcasestr(item->comment, "INDEX") == NULL) {
-            continue;
-        }
 
         if (psStrcasestr(item->comment, "UINDEX")) {
@@ -1696 +1693 @@
             psStringAppend(&query, ", UNIQUE KEY(%s)", index);
             psFree(index);
-        } else {
+        } else if (psStrcasestr(item->comment, "INDEX")) {
             regex_t         myregex;
             regmatch_t      mymatch[2];     // match + 1 sub strings
@@ -1702 +1699 @@
             char            errbuf[errbuf_size];
             // don't accidentally match uindex
-            char            *pattern = "[^U]INDEX[:space:]*[(]([^)]*)";
+            char            *pattern = "[:space:]*INDEX[:space:]*[(]([^)]*)";
 
             int status = regcomp(&myregex, pattern, REG_EXTENDED|REG_ICASE);