Changeset 17600

Timestamp:

May 9, 2008, 8:51:07 AM (18 years ago)

Author:

Paul Price

Message:

Adding table names to conditions.

File:

• trunk/ippTools/src/warptool.c (modified) (5 diffs)

trunk/ippTools/src/warptool.c

@@ -1021 +1021 @@
     // convert warp_id into a psS64
     if (warp_id) {
-        if (!psMetadataAddS64(where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(warp_id))) {
+        if (!psMetadataAddS64(where, PS_LIST_TAIL, "warpRun.warp_id", 0, "==", (psS64)atoll(warp_id))) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
             psFree(where);
@@ -1033 +1033 @@
     // convert cam_id into a psS64
     if (cam_id) {
-        if (!psMetadataAddS64(where, PS_LIST_TAIL, "cam_id", 0, "==", (psS64)atoll(cam_id))) {
+        if (!psMetadataAddS64(where, PS_LIST_TAIL, "camRun.cam_id", 0, "==", (psS64)atoll(cam_id))) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id");
             psFree(where);
@@ -1042 +1042 @@
     // convert chip_id into a psS64
     if (chip_id) {
-        if (!psMetadataAddS64(where, PS_LIST_TAIL, "chip_id", 0, "==", (psS64)atoll(chip_id))) {
+        if (!psMetadataAddS64(where, PS_LIST_TAIL, "chipRun.chip_id", 0, "==", (psS64)atoll(chip_id))) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id");
             psFree(where);
@@ -1051 +1051 @@
     // convert exp_id into a psS64
     if (exp_id) {
-        if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", 0, "==", (psS64)atoll(exp_id))) {
+        if (!psMetadataAddS64(where, PS_LIST_TAIL, "rawExp.exp_id", 0, "==", (psS64)atoll(exp_id))) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
             psFree(where);
@@ -1058 +1058 @@
     }
 
+    // XXX These may need to be updated with the table name?
     PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "==");
     PXOPT_COPY_STR(config->args, where, "-inst", "camera", "==");