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

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

@@ -158 +158 @@
             exposure,
             false,
-            diff_mode,
+            diff_mode,
             note
     );
@@ -204 +204 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "diffRun", true);
+    bool result = pxUpdateRun(config, where, &query, "diffRun", "diff_id", "diffSkyfile", true);
 
     psFree(query);
@@ -210 +210 @@
 
     return result;
-
-#ifdef notdef
-    // required options
-    PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", false, false);
-    PXOPT_LOOKUP_STR(state, config->args, "-state", true, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
-
-    // Copy of my hacky work around from stacktool.c
-    if ((state)&&(diff_id)) {
-        // set detRun.state to state
-        return setdiffRunState(config, diff_id, state, false);
-    }
-
-    if ((state)&&(label)) {
-      return setdiffRunStateByLabel(config, label, state);
-    }
-
-    psError(PS_ERR_UNKNOWN, false, "Required options not found.");
-
-    return false;
-#endif
 }
 
@@ -730 +709 @@
         PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawInput.dateobs",  ">=");
         PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "rawInput.dateobs",  "<=");
-        PXOPT_COPY_STR(config->args, where, "-filter",     "rawInput.filter", "==");
+        PXOPT_COPY_STR(config->args, where, "-filter",     "rawInput.filter", "LIKE");
     } else {
         PXOPT_COPY_S64(config->args, where, "-exp_id", "rawTemplate.exp_id", "==");
@@ -737 +716 @@
         PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawTemplate.dateobs",  ">=");
         PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "rawTemplate.dateobs",  "<=");
-        PXOPT_COPY_STR(config->args, where, "-filter",     "rawTemplate.filter", "==");
+        PXOPT_COPY_STR(config->args, where, "-filter",     "rawTemplate.filter", "LIKE");
     }
 
@@ -1005 +984 @@
       diff_mode = 4;
     }
-    
-    
+
+
     // default
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -1025 +1004 @@
             false,
             0,       // magicked
-            diff_mode, // diff_mode
+            diff_mode, // diff_mode
             note
     );
@@ -1165 +1144 @@
     PXOPT_COPY_S64(config->args, expWhere, "-exp_id", "exp_id", "==");
     PXOPT_COPY_STR(config->args, expWhere, "-filter", "filter", "==");
+    PXOPT_COPY_STR(config->args, expWhere, "-comment", "comment", "LIKE");
     PXOPT_COPY_S64(config->args, warp1Where, "-warp_id", "warpRun.warp_id", "==");
     PXOPT_COPY_STR(config->args, warp1Where, "-warp_label", "warpRun.label", "==");
@@ -1436 +1416 @@
                 true,                   // exposure
                 0,       // magicked
-                2,       // diff_mode for warp-stack difference
+                2,       // diff_mode for warp-stack difference
                 note
         );
@@ -1584 +1564 @@
     // Additional controls
     PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
-    PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
 
     // Settings to apply to defined run
@@ -1677 +1656 @@
     if (psListLength(selectWhere->list)) {
         psString new = psDBGenerateWhereConditionSQL(selectWhere, NULL);
-        psStringAppend(&whereClause, "\n%s %s", whereClause ? "AND" : "WHERE", new);
+        psStringAppend(&whereClause, "\nAND %s", new);
         psFree(new);
     }
     psFree(selectWhere);
 
-    if (!available) {
-        psStringAppend(&whereClause,
-                       "\n%s inputWarpRun.state = 'full'"
-                       "AND templateWarpRun.state = 'full'",
-                       whereClause ? "AND" : "WHERE");
-    }
-
     if (!rerun) {
-        psStringAppend(&whereClause, "\n%s diffs.diff_id IS NULL", whereClause ? "AND" : "WHERE");
+        psStringAppend(&whereClause, "\nAND diffs.diff_id IS NULL");
     }
 
@@ -1779 +1751 @@
 
         diffRunRow *run = diffRunRowAlloc(0,
-                                          "reg",
-                                          workdir,
-                                          label,
-                                          data_group ? data_group : label,
-                                          dist_group,
-                                          reduction,
-                                          NULL,  // dvodb
-                                          registered,
+                                          "reg",
+                                          workdir,
+                                          label,
+                                          data_group ? data_group : label,
+                                          dist_group,
+                                          reduction,
+                                          NULL,  // dvodb
+                                          registered,
                                           tess_id,
-                                          true,  // bothways
-                                          true,  // exposure
-                                          false, // magicked
-                                          1,     // diff_mode for warp-warp diff
-                                          note); // Run to insert
+                                          true,  // bothways
+                                          true,  // exposure
+                                          false, // magicked
+                                          1,     // diff_mode for warp-warp diff
+                                          note); // Run to insert
         if (!diffRunInsertObject(config->dbh, run)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -2073 +2045 @@
                                       false,                 // exposure
                                       0,       // magicked
-                                      4,       // diff_mode
+                                      4,       // diff_mode
                                       note
                                       );