Changeset 26915

Timestamp:

Feb 11, 2010, 3:01:34 PM (16 years ago)

Author:

bills

Message:

In addtool -definebyquery prevent queuing a new addRun if one already exists
for the given exposure in the target dvo database

Location:

trunk/ippTools

Files:

• share/addtool_find_cam_id.sql (modified) (1 diff)
• src/addtool.c (modified) (3 diffs)
• src/addtoolConfig.c (modified) (1 diff)

trunk/ippTools/share/addtool_find_cam_id.sql

@@ -6 +6 @@
 JOIN rawExp
     USING(exp_id)
+LEFT JOIN (SELECT exp_id       AS added_exp_id,
+                  addRun.dvodb AS previous_dvodb
+           FROM addRun
+           JOIN camRun USING(cam_id)
+           JOIN chipRun USING(chip_id)
+          ) as foo
+     ON exp_id = added_exp_id
+     -- hook for qualifying the join on the previous_dvodb
+     AND %s
 WHERE
     camRun.state = 'full'
+    AND added_exp_id IS NULL
+    -- addtool adds checks on exposure being added to the dvodb previously

trunk/ippTools/src/addtool.c

@@ -99 +99 @@
     PXOPT_COPY_S64(config->args, where,  "-cam_id",    "camRun.cam_id", "==");
     pxAddLabelSearchArgs (config, where, "-label",     "camRun.label", "=="); // define using camRun label
+    pxAddLabelSearchArgs (config, where, "-data_group","camRun.data_group", "=="); // define using camRun label
     PXOPT_COPY_STR(config->args, where,  "-reduction", "camRun.reduction", "==");
 
@@ -119 +120 @@
 
     // find the cam_id of all the exposures that we want to queue up.
-    psString query = pxDataGet("addtool_find_cam_id.sql");
-    if (!query) {
+    psString bare_query = pxDataGet("addtool_find_cam_id.sql");
+    if (!bare_query) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
         psFree(where);
         return false;
     }
+
+    // prevent queueing an addRun if a given exposure has already been added to 
+    // the given dvo database
+    psString dvodb_string = NULL;
+    if (dvodb) {
+        // user supplied dvodb
+        psStringAppend(&dvodb_string, "(previous_dvodb = '%s')", dvodb);
+    } else {
+        // inherit dvodb from camRun, avoid matching NULL
+        psStringAppend(&dvodb_string, "(camRun.dvodb IS NOT NULL AND previous_dvodb = camRun.dvodb)");
+    }
+    // Take the bare query and add the dvodb selector
+    psString query = NULL;
+    psStringAppend(&query, bare_query, dvodb_string);
+    psFree(dvodb_string);
+    psFree(bare_query);
 
     // use psDBGenerateWhereConditionSQL because the SQL ends in a WHERE
@@ -131 +148 @@
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
+    } else {
+        psError(PS_ERR_UNKNOWN, true, "search parameters are required");
+        return false;
     }
     psFree(where);

trunk/ippTools/src/addtoolConfig.c

@@ -52 +52 @@
     pxcamSetSearchArgs(definebyqueryArgs);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by camRun data_group", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",          0, "search by camRun reduction class", NULL);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked",           0, "only queue destreaked runs", false);