Changeset 19256

Timestamp:

Aug 27, 2008, 5:57:07 PM (18 years ago)

Author:

eugene

Message:

add label; fix definebyquery -- do not join against tess_id

File:

• trunk/ippTools/src/stacktool.c (modified) (3 diffs)

trunk/ippTools/src/stacktool.c

@@ -129 +129 @@
     PXOPT_COPY_F32(config->args,  where, "-select_good_frac_min",      "warpSkyfile.good_frac", ">=");
     PXOPT_COPY_STR(config->args,  where, "-select_skycell_id",         "warpSkyfile.skycell_id", "==");
+    PXOPT_COPY_STR(config->args,  where, "-select_label",              "warpRun.label", "==");
 
     // these are used to build the HAVING restriction
@@ -242 +243 @@
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&select, " AND %s", whereClause);
+        psStringAppend(&insert, " AND %s", whereClause);
         psFree(whereClause);
     }
@@ -350 +351 @@
         // this insert needs to use exactly the same restrictions (race condition is probably not critical)
         // the insert below seems to only restrict matches to the skycell, tess, and filter
-        if ((randomLimit > 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, tess_id, filter,
-                                                randomLimit)) ||
-            (randomLimit <= 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, tess_id, filter))) {
+        if ((randomLimit > 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, filter, randomLimit)) ||
+            (randomLimit <= 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, filter))) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(thisInsert);