Changeset 40483 for branches/czw_branch/20170908/ippTools/src

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

• . (modified) (1 prop)
• ippTools/src/dettool.c (modified) (5 diffs)
• ippTools/src/pxchip.c (modified) (4 diffs)

branches/czw_branch/20170908/ippTools/src/dettool.c

@@ -1513 +1513 @@
     psList *exp_id_list = item->data.list;
     psMetadata *where = psMetadataAlloc();
+
+    // make sure that -exp_id was parsed correctly
+    if (item->type == PS_DATA_METADATA_MULTI) {
+        psListIterator *iter = psListIteratorAlloc(item->data.list, 0, false);
+        psMetadataItem *mItem = NULL;
+        while ((mItem = psListGetAndIncrement(iter))) {
+            psS64 exp_id = mItem->data.S64;
+            if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", PS_META_DUPLICATE_OK, "==", exp_id)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
+                psFree(iter);
+                psFree(where);
+                return false;
+            }
+        }
+        psFree(iter);
+    }
+    if (item->type == PS_DATA_S64) {
+        psS64 exp_id = item->data.S64;
+        if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", PS_META_DUPLICATE_OK, "==", exp_id)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
+            psFree(where);
+            return false;
+        }
+    }
+
+# if (0)
     // make sure that -exp_id was parsed correctly
     // XXX this can be removed someday
@@ -1541 +1567 @@
         psAbort("-exp_id was not parsed correctly (this should not happen");
     }
+# endif
 
     // check that the specified exp_ids actually exist in the iteration zero
@@ -1599 +1626 @@
     psArray *newInputExps = psArrayAllocEmpty(psListLength(exp_id_list));
     while ((mItem = psListGetAndIncrement(iter))) {
-        detInputExpRow *inputExp = psHashLookup(valid_exp_ids,
-                (char *)mItem->data.V);
-        if (!inputExp) {
+      psString exp_idStr = psDBIntToString(mItem->data.S64);
+      detInputExpRow *inputExp = psHashLookup(valid_exp_ids, exp_idStr);
+      if (!inputExp) {
             // rollback
             if (!psDBRollback(config->dbh)) {
@@ -1607 +1634 @@
             }
             // invalid exp_id
-            psError(PS_ERR_UNKNOWN, false, "exp_id %s is invalid for det_id %" PRId64,
-                    (char *)mItem->data.V, det_id);
+            psError(PS_ERR_UNKNOWN, false, "exp_id %" PRId64 " is invalid for det_id %" PRId64, mItem->data.S64, det_id);
             psFree(iter);
             psFree(valid_exp_ids);
@@ -2452 +2478 @@
         psMetadata *where = psMetadataAlloc();
         for (long i = 0; i < psArrayLength(inputExps); i++) {
+          XXX note that exp_id is not a STRING
             if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id",
                     PS_META_DUPLICATE_OK, "==",

branches/czw_branch/20170908/ippTools/src/pxchip.c

@@ -43 +43 @@
     psMetadataAddStr(md,  PS_LIST_TAIL, "-exp_tag",            0, "search by exp_tag", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-exp_type",           0, "search by exp_type", NULL);
+    psMetadataAddStr(md,  PS_LIST_TAIL, "-data_state",         0, "search by data_state", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-filelevel",          0, "search by filelevel", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-filter",             0, "search for filter", NULL);
@@ -73 +74 @@
     psMetadataAddStr(md,  PS_LIST_TAIL, "-object",             0, "search by exposure object (LIKE comparison)", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-comment",            0, "search by comment field (LIKE comparison)", NULL);
+    psMetadataAddStr(md,  PS_LIST_TAIL, "-comment-skip",       0, "exclude by comment field (NOT LIKE comparison)", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-obs_mode",           0, "search by observation mode", NULL);
     return true;
@@ -95 +97 @@
     PXOPT_COPY_STR(config->args, where, "-exp_tag", "rawExp.exp_tag", "==");
     PXOPT_COPY_STR(config->args, where, "-exp_type", "rawExp.exp_type", "==");
+    PXOPT_COPY_STR(config->args, where, "-data_state", "rawExp.state", "==");
     PXOPT_COPY_STR(config->args, where, "-filelevel", "rawExp.filelevel", "==");
     PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "LIKE");
@@ -125 +128 @@
     PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "rawExp.sun_angle", "<");
     PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-comment-skip", "rawExp.comment", "NOTLKE");
     PXOPT_COPY_STR(config->args, where, "-obs_mode", "rawExp.obs_mode", "LIKE");
     return true;