Changeset 28468

Timestamp:

Jun 24, 2010, 12:34:53 PM (16 years ago)

Author:

Paul Price

Message:

Fix advance modes.

Location:

branches/pap/ippTools/src

Files:

• bgtool.c (modified) (5 diffs)
• bgtoolConfig.c (modified) (2 diffs)

branches/pap/ippTools/src/bgtool.c

@@ -169 +169 @@
         if (psListLength(where->list)) {
             psString whereClause = psDBGenerateWhereSQL(where, NULL);
-            psStringAppend(&query, " WHERE %s", whereClause);
+            psStringAppend(&query, " %s", whereClause);
             psFree(whereClause);
         }
@@ -757 +757 @@
     PXOPT_COPY_S64(config->args, where, "-chip_bg_id", "chip_bg_id", "==");
     pxAddLabelSearchArgs(config, where, "-label", "label", "==");
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
 
     psString select = pxDataGet("bgtool_advancechip.sql");
@@ -766 +767 @@
     psString selectWhere = psStringCopy("");
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereSQL(where, NULL);
-        psStringAppend(&selectWhere, "\n WHERE %s", whereClause);
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&selectWhere, "\n AND %s", whereClause);
         psFree(whereClause);
     }
     psFree(where);
+
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&select, " %s", limitString);
+        psFree(limitString);
+    }
 
     if (!psDBTransaction(config->dbh)) {
@@ -1522 +1529 @@
     PXOPT_COPY_S64(config->args, where, "-warp_bg_id", "warp_bg_id", "==");
     pxAddLabelSearchArgs(config, where, "-label", "label", "==");
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
 
     psString select = pxDataGet("bgtool_advancewarp.sql");
@@ -1531 +1539 @@
     psString selectWhere = psStringCopy("");
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereSQL(where, NULL);
-        psStringAppend(&selectWhere, "\n WHERE %s", whereClause);
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&selectWhere, "\n AND %s", whereClause);
         psFree(whereClause);
     }
     psFree(where);
+
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&select, " %s", limitString);
+        psFree(limitString);
+    }
 
     if (!psDBTransaction(config->dbh)) {

branches/pap/ippTools/src/bgtoolConfig.c

@@ -173 +173 @@
     psMetadataAddS64(advancechipArgs, PS_LIST_TAIL, "-chip_bg_id", 0, "search by chip_bg_id", 0);
     psMetadataAddStr(advancechipArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label ", NULL);
+    psMetadataAddU64(advancechipArgs, PS_LIST_TAIL, "-limit", 0, "search limit", 0);
 
     // -revertchip
@@ -332 +333 @@
     psMetadataAddS64(advancewarpArgs, PS_LIST_TAIL, "-warp_bg_id", 0, "search by warp_bg_id", 0);
     psMetadataAddStr(advancewarpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label ", NULL);
+    psMetadataAddU64(advancewarpArgs, PS_LIST_TAIL, "-limit", 0, "search limit", 0);
 
     // -revertwarp