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

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

@@ -114 +114 @@
     PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
     PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
-    PXOPT_LOOKUP_BOOL(dry_run, config->args, "-dry_run", false);
+    PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -237 +237 @@
     // Parse the list of runs ready to be destreaked
 
-    if (!dry_run && !psDBTransaction(config->dbh)) {
+    if (!pretend && !psDBTransaction(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -286 +286 @@
         }
 
-        if (!dry_run) {
+        if (!pretend) {
             if (!magicDSRunInsertObject(config->dbh, run)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -305 +305 @@
     }
 
-    if (!dry_run && !psDBCommit(config->dbh)) {
+    if (!pretend && !psDBCommit(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -392 +392 @@
         return false;
     }
-    const char *rerun_flag =  rerun ? "\n" : ""; // String to give query to activate (or not) rerun
+    const char *rerun_flag =  rerun ? "" : "\n"; // String to give query to activate (or not) rerun
 
     if (stageNum != IPP_STAGE_DIFF) {
@@ -408 +408 @@
             psFree(limitString);
         }
-        if (!p_psDBRunQueryF(config->dbh, query, rerun_flag)) {
+        if (!p_psDBRunQueryF(config->dbh, query, set_label, rerun_flag)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(query);
@@ -552 +552 @@
     // optional
     PXOPT_LOOKUP_STR(set_label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(set_data_group, config->args, "-set_data_group", false, false);
     psString setString = NULL;
     if (set_label) {
         psStringAppend(&setString, ", label = '%s'", set_label);
+    }
+    if (set_data_group) {
+        psStringAppend(&setString, ", data_group = '%s'", set_data_group);
     }
 
@@ -573 +577 @@
     PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "==");
     PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
+    PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
+    PXOPT_COPY_STR(config->args, where, "-data_group", "data_group", "LIKE");
 
     if (psListLength(where->list) < 2) {
@@ -832 +838 @@
     PXOPT_LOOKUP_BOOL(setmagicked, config->args, "-setmagicked", false);
     PXOPT_LOOKUP_F32(streak_frac, config->args, "-streak_frac", false, false);
+    PXOPT_LOOKUP_F32(nondiff_frac, config->args, "-nondiff_frac", false, false);
     PXOPT_LOOKUP_F32(run_time, config->args, "-run_time", false, false);
 
@@ -861 +868 @@
             recovery_path_base,
             streak_frac,
+            nondiff_frac,
             run_time,
             fault,
@@ -1190 +1198 @@
     if (!((strcmp(state, "new") == 0) ||
           (strcmp(state, "full") == 0) ||
+          (strcmp(state, "drop") == 0) ||
           (strcmp(state, "failed_revert") == 0) ||
           (strcmp(state, "failed_cleanup") == 0) ||
@@ -1398 +1407 @@
     psMetadata *where = psMetadataAlloc();
 
-    PXOPT_COPY_S64(config->args, where, "-stage", "stage", "==");
+    PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
     PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");