Changeset 26444

Timestamp:

Dec 16, 2009, 3:55:38 PM (16 years ago)

Author:

bills

Message:

add dqstatstool to ignorelist

Location:

trunk/ippTools/src

Files:

• . (modified) (1 prop)
• magicdstool.c (modified) (2 diffs)
• magicdstoolConfig.c (modified) (1 diff)
• receivetool.c (modified) (3 diffs)
• receivetoolConfig.c (modified) (1 diff)

trunk/ippTools/src

@@ -16 +16 @@
 difftool
 disttool
+dqstastool
 faketool
 flatcorr

@@ -16 +16 @@
 difftool
 disttool
+dqstastool
 faketool
 flatcorr

trunk/ippTools/src/magicdstool.c

@@ -598 +598 @@
     PXOPT_LOOKUP_STR(recovery_path_base, config->args, "-recovery_path_base", false, false);
     PXOPT_LOOKUP_BOOL(setmagicked, config->args, "-setmagicked", false);
+    PXOPT_LOOKUP_F32(streak_frac, config->args, "-streak_frac", false, false);
+    PXOPT_LOOKUP_F32(run_time, config->args, "-run_time", false, false);
 
     if (setmagicked && (fault != 0)) {
@@ -620 +622 @@
     }
 
-    if (!magicDSFileInsert(config->dbh, magic_ds_id, component, backup_path_base, recovery_path_base, fault, "full")) {
+    if (!magicDSFileInsert(config->dbh,
+            magic_ds_id,
+            component,
+            backup_path_base,
+            recovery_path_base,
+            streak_frac,
+            run_time,
+            fault,
+            "full"  // data_state
+        )) {
             // rollback
         if (!psDBRollback(config->dbh)) {

trunk/ippTools/src/magicdstoolConfig.c

@@ -102 +102 @@
     psMetadataAddStr(adddestreakedfileArgs, PS_LIST_TAIL, "-recovery_path_base", 0, "define recovery pixels URI", NULL);
     psMetadataAddBool(adddestreakedfileArgs, PS_LIST_TAIL, "-setmagicked", 0, "update the magicked state of the file", false);
+    psMetadataAddF32(todestreakArgs, PS_LIST_TAIL, "-masked_frac", 0, "set fraction of pixels masked by streaks", 0);
+    psMetadataAddF32(todestreakArgs, PS_LIST_TAIL, "-run_time", 0, "set the streaksremove run time for component ", 0);
     psMetadataAddS16(adddestreakedfileArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0);
 

trunk/ippTools/src/receivetool.c

@@ -105 +105 @@
     // optional
     PXOPT_LOOKUP_STR(comment, config->args, "-comment",  false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-state",  false, false);
     PXOPT_LOOKUP_STR(last, config->args, "-last",  false, false);
     PXOPT_LOOKUP_STR(status_product, config->args, "-status_product",  false, false);
@@ -110 +111 @@
     PXOPT_LOOKUP_STR(ds_dbhost, config->args, "-ds_dbhost",  false, false);
 
-    if (!receiveSourceInsert(config->dbh, 0, source, product, workdir, comment, last, status_product, ds_dbname, ds_dbhost)) {
+    if (!receiveSourceInsert(config->dbh, 0, source, product, workdir, state, comment, last, status_product, ds_dbname, ds_dbhost)) {
         psError(PS_ERR_UNKNOWN, false, "Database error");
         return false;
@@ -142 +143 @@
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " WHERE %s", whereClause);
+        psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
     }

trunk/ippTools/src/receivetoolConfig.c

@@ -49 +49 @@
     psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-workdir",   0, "define workdir (required)", NULL);
     psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-comment", 0, "define comment", NULL);
+    psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-state", 0, "define state", "enabled");
     psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-last", 0, "define last fileset", NULL);
     psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-status_product", 0, "define status_product", NULL);

@@ -16 +16 @@
 difftool
 disttool
+dqstastool
 faketool
 flatcorr