Changeset 27517 for branches/eam_branches/20100225/ippTools/src/warptool.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippTools/src/warptool.c (modified) (4 diffs)

branches/eam_branches/20100225/ippTools/src/warptool.c

@@ -383 +383 @@
     PXOPT_COPY_S64(config->args, where, "-warp_id",   "warpRun.warp_id",   "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "warpRun.reduction", "==");
-    PXOPT_COPY_STR(config->args, where, "-label",     "warpRun.label",     "==");
     PXOPT_COPY_STR(config->args, where, "-state",     "warpRun.state",     "==");
-    PXOPT_COPY_STR(config->args, where, "-data_group","warpRun.data_group",     "==");
-    PXOPT_COPY_STR(config->args, where, "-dist_group","warpRun.dist_group",     "==");
+    PXOPT_COPY_STR(config->args, where, "-data_group","warpRun.data_group","==");
+    PXOPT_COPY_STR(config->args, where, "-dist_group","warpRun.dist_group","==");
+    pxAddLabelSearchArgs(config,  where, "-label",    "warpRun.label",     "==");
+
+    PXOPT_COPY_TIME(config->args, where, "-registered_begin", "warpRun.registered",  ">=");
+    PXOPT_COPY_TIME(config->args, where, "-registered_end",   "warpRun.registered",  "<");
+
+    PXOPT_LOOKUP_BOOL(destreaked, config->args, "-destreaked", false);
+    if (destreaked) {
+        psMetadataAddS64(where, PS_LIST_TAIL, "warpRun.magicked", PS_META_DUPLICATE_OK, ">", 0);
+    }
 
     if (!psListLength(where->list)) {
@@ -394 +402 @@
     }
 
-    psString query = psStringCopy("UPDATE warpRun JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)");
+    psString query = psStringCopy("UPDATE warpRun JOIN warpSkyfile USING(warp_id) JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)");
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "warpRun", true);
+    bool result = pxUpdateRun(config, where, &query, "warpRun", "warp_id", "warpSkyfile", true);
 
     psFree(query);
@@ -899 +907 @@
     }
 
+    psString whereStr = psStringCopy("");
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
+        psStringAppend(&whereStr, "\n AND %s", whereClause);
         psFree(whereClause);
     }
@@ -913 +922 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
+#ifdef TWO_WHERES
+    if (!p_psDBRunQueryF(config->dbh, query, whereStr, whereStr)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
         return false;
     }
+#else
+    if (!p_psDBRunQueryF(config->dbh, query, whereStr)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+#endif
+    psFree(whereStr);
     psFree(query);