Changeset 28312

Timestamp:

Jun 14, 2010, 2:09:58 PM (16 years ago)

Author:

bills

Message:

import some bug fixes from the trunk.

Location:

tags/ipp-20100610

Files:

• ippTools (modified) (1 prop)
• ippTools/share/chiptool_processedimfile.sql (modified) (1 diff)
• ippTools/src/pstamptool.c (modified) (2 diffs)
• ippTools/src/pstamptoolConfig.c (modified) (1 diff)
• magic/remove/src/streaksio.c (modified) (1 diff, 1 prop)
• pstamp (modified) (1 prop)
• pstamp/src/ppstampMakeStamp.c (modified) (1 diff)

tags/ipp-20100610/ippTools/share/chiptool_processedimfile.sql

@@ -29 +29 @@
     rawImfile.magicked AS raw_magicked,
     rawImfile.burntool_state,
-    magicDSRun.state AS dsRun_state
+    magicDSRun.state AS dsRun_state,
+    magicDSRun.magic_ds_id
 FROM chipRun
 JOIN chipImfile

tags/ipp-20100610/ippTools/src/pstamptool.c

@@ -870 +870 @@
 
     PXOPT_LOOKUP_S64(job_id,    config->args, "-job_id", false, false);
+    PXOPT_LOOKUP_S64(req_id,    config->args, "-req_id", false, false);
     PXOPT_LOOKUP_S64(dep_id,    config->args, "-dep_id", false, false);
 
-    if (!job_id && !dep_id) {
-        psError(PS_ERR_UNKNOWN, true, "at least -job_id or -dep_id is required");
+    if (!job_id && !req_id && !dep_id) {
+        psError(PS_ERR_UNKNOWN, true, "at least one of -job_id -req_id or -dep_id is required");
         return false;
     }
@@ -888 +889 @@
 
     PXOPT_COPY_S64(config->args, where, "-job_id", "job_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
     PXOPT_COPY_S64(config->args, where, "-dep_id", "dep_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-state",  "pstampJob.state", "==");
 
     psString query = pxDataGet("pstamptool_updatejob.sql");

tags/ipp-20100610/ippTools/src/pstamptoolConfig.c

@@ -160 +160 @@
     // -updatejob
     psMetadata *updatejobArgs = psMetadataAlloc();
-    psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-job_id", 0,            "req_id for which to change state", 0);
-    psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-dep_id", 0,            "dep_id for which to change state", 0);
+    psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-req_id", 0,            "req_id of jobs to update", 0);
+    psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-job_id", 0,            "job_id of jobs to update", 0);
+    psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-dep_id", 0,            "dep_id of jobs to update", 0);
+    psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-state", 0,            "current state of jobs to update", 0);
     psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-set_state", 0,            "new state", NULL);
     psMetadataAddS16(updatejobArgs, PS_LIST_TAIL, "-set_fault", 0,            "new result", 0);

tags/ipp-20100610/magic/remove/src/streaksio.c

@@ -1294 +1294 @@
         }
     }
-    sfiles->maskMask = ~convPoor;
+    // preserve pixels that are only suspect
+    psU32 suspect = (double) psMetadataLookupU32(&status, masks, "SUSPECT");
+    if (!status) {
+        psError(PM_ERR_CONFIG, false, "failed to lookup mask value for SUSPECT in recipes\n");
+        streaksExit("", PS_EXIT_CONFIG_ERROR);
+    }
+
+    sfiles->maskMask = ~(convPoor | suspect);
 }
 

tags/ipp-20100610/pstamp/src/ppstampMakeStamp.c

@@ -688 +688 @@
         }
     }
-    psU32 maskMask = ~convPoor;
+    psU32 suspect = psMetadataLookupU32(&status, masks, "SUSPECT");
+    if (!status) {
+        psError(PM_ERR_CONFIG, false, "failed to lookup mask value for SUSPECT in recipes\n");
+        return false;
+    }
+    psU32 maskMask = ~(convPoor | suspect);
 
     double exciseValue;