Changeset 24681

Timestamp:

Jul 6, 2009, 12:49:41 PM (17 years ago)

Author:

bills

Message:

Add magicked column to camRun

Location:

trunk

Files:

• dbconfig/cam.md (modified) (1 diff)
• dbconfig/changes.txt (modified) (1 diff)
• ippTools/share/camtool_queue_chip_id.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/src/camtool.c (modified) (2 diffs)
• ippTools/src/camtoolConfig.c (modified) (1 diff)
• ippTools/src/pxcam.c (modified) (2 diffs)
• ippTools/src/pxcam.h (modified) (1 diff)

trunk/dbconfig/cam.md

@@ -11 +11 @@
     tess_id     STR         64
     end_stage   STR         64      # Key
+    magicked    S64         0
 END
 

trunk/dbconfig/changes.txt

@@ -1195 +1195 @@
 ALTER TABLE diffRun CHANGE COLUMN magicked  magicked BIGINT;
 
-
+ALTER TABLE camRun ADD COLUMN magicked BIGINT;

trunk/ippTools/share/camtool_queue_chip_id.sql

@@ -13 +13 @@
         '%s',           -- dvodb 
         '%s',           -- tess_id
-        '%s'            -- end_stage
+        '%s',           -- end_stage
+        0               -- magicked
     FROM chipRun
     WHERE

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -365 +365 @@
     tess_id VARCHAR(64),
     end_stage VARCHAR(64),
+    magicked BIGINT,
     PRIMARY KEY(cam_id),
     KEY(cam_id),

trunk/ippTools/src/camtool.c

@@ -491 +491 @@
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
     PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false);
+    
+    PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false);
 
     // generate restrictions
@@ -614 +616 @@
 
     // since there is only one exp per 'new' set camRun.state = 'full'
-    if (!pxcamRunSetState(config, row->cam_id, "full")) {
+    if (!pxcamRunSetState(config, row->cam_id, "full", magicked)) {
         psError(PS_ERR_UNKNOWN, false, "failed to change camRun.state for cam_id: %" PRId64, row->cam_id);
         psFree(row);

trunk/ippTools/src/camtoolConfig.c

@@ -167 +167 @@
     psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-quality",  0,            "set quality", 0);
     psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-faulted",  0,            "only return imfiles with a fault status set", false);
+    psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-magicked",   0,         "set magicked", 0);
 
     // -processedexp

trunk/ippTools/src/pxcam.c

@@ -119 +119 @@
 }
 
-bool pxcamRunSetState(pxConfig *config, psS64 cam_id, const char *state)
+bool pxcamRunSetState(pxConfig *config, psS64 cam_id, const char *state, psS64 magicked)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -131 +131 @@
     }
 
-    char *query = "UPDATE camRun SET state = '%s' WHERE cam_id = %" PRId64;
-    if (!p_psDBRunQueryF(config->dbh, query, state, cam_id)) {
+    char *query = "UPDATE camRun SET state = '%s', SET magicked = %" PRId64 " WHERE cam_id = %" PRId64;
+    if (!p_psDBRunQueryF(config->dbh, query, state, magicked, cam_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for cam_id %" PRId64, cam_id);

trunk/ippTools/src/pxcam.h

@@ -25 +25 @@
 #include "pxtools.h"
 
-bool pxcamRunSetState(pxConfig *config, psS64 cam_id, const char *state);
+bool pxcamRunSetState(pxConfig *config, psS64 cam_id, const char *state, psS64 magicked);
 bool pxcamRunSetStateByQuery(pxConfig *config, psMetadata *where, const char *state);
 bool pxcamRunSetLabel(pxConfig *config, psS64 cam_id, const char *label);