Changeset 18923 for branches/eam_branch_20080719/ippTools/src/chiptool.c

Timestamp:

Aug 5, 2008, 2:07:07 PM (18 years ago)

Author:

eugene

Message:

updates from HEAD

File:

• branches/eam_branch_20080719/ippTools/src/chiptool.c (modified) (4 diffs)

branches/eam_branch_20080719/ippTools/src/chiptool.c

@@ -522 +522 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.chip_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-class_id", "rawImfile.class_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.telescope", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-class_id", "chipProcessedImfile.class_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "==");
     PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "==");
 
@@ -534 +534 @@
 
     if (where && psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "chipProcessedImfile");
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -628 +628 @@
     PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">=");
     PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<");
+    PXOPT_COPY_S16(config->args, where, "-code", "fault", "=");
 
     if (!psListLength(where->list)
@@ -782 +783 @@
         return false;
     }
-    
+
     if (where) {
         psString whereClause = psDBGenerateWhereSQL(where, "chipUnmask");