Changeset 27517 for branches/eam_branches/20100225/ippTools/src/disttool.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/disttool.c (modified) (13 diffs)

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

@@ -137 +137 @@
 
     // optional
-    PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id",  false, false);
+    PXOPT_LOOKUP_BOOL(use_alternate, config->args, "-use_alternate", false);
     PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
     PXOPT_LOOKUP_STR(set_label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(set_data_group, config->args, "-set_data_group", false, false);
     PXOPT_LOOKUP_STR(set_note, config->args, "-set_note", false, false);
 
@@ -145 +146 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
-    PXOPT_LOOKUP_BOOL(dry_run, config->args, "-dry_run", false);
+    PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
+
+    if (use_alternate) { 
+        if (strcmp(stage, "raw")) {
+            psError(PXTOOLS_ERR_SYS, true, "alternate inputs only supported for raw stage");
+            return false;
+        }
+        if (no_magic) {
+            psError(PXTOOLS_ERR_SYS, true, "no_magic forbidden with alternate inputs");
+            return false;
+        }
+    }
 
     // select arguments
@@ -161 +173 @@
     psString runJoinStr = NULL;
     if (!strcmp(stage, "raw")) {
-        magicRunType = "rawExp";
-        runJoinStr = "rawExp.exp_id";
+        if (! use_alternate ) {
+            magicRunType = "rawExp";
+            runJoinStr = "rawExp.exp_id";
+        } else {
+            magicRunType = "camRun";
+            runJoinStr = "camRun.exp_id";
+        }
         query = pxDataGet("disttool_definebyquery_raw.sql");
         if (!query) {
@@ -170 +187 @@
         }
 
-        // for raw stage we select by chipRun.label because raw labels typically aren't set
+        // for raw stage we select by camRun.label and dist_group because rawExp doesn't have those columns
         if (label) {
-            psStringAppend(&query, " AND (chipRun.label = '%s')", label);
+            psStringAppend(&query, " AND (magicDSRun.label = '%s')", label);
         }
         if (dist_group) {
-            psStringAppend(&query, " AND (chipRun.dist_group = '%s')", dist_group);
+            psStringAppend(&query, " AND (camRun.dist_group = '%s')", dist_group);
         }
     } else if (!strcmp(stage, "chip")) {
@@ -301 +318 @@
     }
 
+    if (!strcmp(stage, "raw")) {
+        if (!no_magic) {
+            psStringAppend(&query, " AND (magicDSRun.re_place = %d)", !use_alternate);
+            psStringAppend(&query, " AND (camRun.state = 'full')");
+        }
+    }
+
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
@@ -311 +335 @@
 
     if (!no_magic) {
-        psStringAppend(&query, " AND (%s.magicked)", magicRunType);
-
-        // is selecting by magic_ds_id really interesting?
-        if (magic_ds_id) {
-            if (!runJoinStr) {
-                psError(PS_ERR_PROGRAMMING, true, "cannot select by magic_ds_id for stage: %s", stage);
-                psFree(query);
-                return false;
-            }
-            psStringAppend(&joinHook, "\nJOIN magicDSRun ON magicDSRun.stage = distTarget.stage"
-                                              " AND magicDSRun.stage_id = %s", runJoinStr);
-            psStringAppend(&query, " AND (magicDSRun.state = 'full' AND magicDSRun.re_place AND (magicDSRun.magic_ds_id = %" PRId64 "))", magic_ds_id);
-        }
+        psStringAppend(&query, " AND (%s.magicked > 0)", magicRunType);
     }
 
@@ -352 +364 @@
 
 
-    if (dry_run) {
+    if (pretend) {
         if (!ippdbPrintMetadatas(stdout, output, "newdistRuns", true)) {
             psError(PS_ERR_UNKNOWN, false, "failed to print array");
@@ -376 +388 @@
         psS64 target_id = psMetadataLookupS64(NULL, md, "target_id");
         psString stage_label = psMetadataLookupStr(NULL, md, "label");
-        psString data_group = psMetadataLookupStr(NULL, md, "data_group");
+        psString stage_data_group = psMetadataLookupStr(NULL, md, "data_group");
         bool clean = psMetadataLookupBool(NULL, md, "clean");
 
@@ -388 +400 @@
             new_label = stage_label;
         }
+        psString new_data_group;
+        if (set_data_group != NULL) {
+            new_data_group = set_data_group;
+        } else {
+            new_data_group = stage_data_group;
+        }
+
         distRunRow *row = distRunRowAlloc(
                 0,      // dist_id
@@ -399 +418 @@
                 clean,
                 no_magic,
+                use_alternate,
                 "new",
                 NULL,    // time_stamp
                 0,       // fault
-                data_group,
+                new_data_group,
                 set_note // note does not propagate
                 );
@@ -448 +468 @@
     PXOPT_COPY_STR(config->args, where, "-state", "distRun.state", "==");
     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
-    PXOPT_COPY_STR(config->args, where, "-data_group", "distRun.data_group", "==");
+    PXOPT_COPY_STR(config->args, where, "-data_group", "distRun.data_group", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-dist_group", "distTarget.dist_group", "==");
     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
@@ -460 +480 @@
     PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(data_group, config->args, "-set_data_group", false, false);
     PXOPT_LOOKUP_STR(outdir, config->args, "-set_outdir", false, false);
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
-
-    if ((!state) && (!label) && (!fault)) {
-        psError(PXTOOLS_ERR_CONFIG, false, "parameters (-fault or -set_state or -set_label) are required");
+    PXOPT_LOOKUP_STR(set_note, config->args, "-set_note", false, false);
+
+    if ((!state) && (!label) && (!fault) &&(!data_group)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "parameters (-fault or -set_state or -set_label -set_data_group) are required");
         psFree(where);
         return false;
@@ -485 +507 @@
         psStringAppend(&query, " , distRun.fault = %d", fault);
     }
+
+    if (data_group) {
+        psStringAppend(&query, " , distRun.data_group = '%s'", data_group);
+    }
+
+    if (set_note) {
+        psStringAppend(&query, " , distRun.note = '%s'", set_note);
+    }
+
 
     psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);