Changeset 27028

Timestamp:

Feb 22, 2010, 1:44:30 PM (16 years ago)

Author:

Paul Price

Message:

Schema change to support requirement of magicked detections for MOPS publishing.

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/publish.md (modified) (1 diff)
• ippTools/share/pubtool_definerun.sql (modified) (2 diffs)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/src/pubtool.c (modified) (1 diff)
• ippTools/src/pubtoolConfig.c (modified) (1 diff)

trunk/dbconfig/changes.txt

@@ -1519 +1519 @@
 -- Version 1.1.65
 
+ALTER TABLE publishClient ADD COLUMN magicked TINYINT DEFAULT 1 AFTER stage;
+

trunk/dbconfig/publish.md

@@ -6 +6 @@
     product      STR         64
     stage        STR         64
+    magicked     BOOL        TRUE
     workdir      STR         255
     comment      STR         255

trunk/ippTools/share/pubtool_definerun.sql

@@ -15 +15 @@
         AND publishClient.active = 1
         AND diffRun.state = 'full'
+        AND (diffRun.magicked > 0 OR publishClient.magicked = 0)
     -- WHERE hook %s
     UNION
@@ -27 +28 @@
         AND publishClient.active = 1
         AND camRun.state = 'full'
+        AND (camRun.magicked > 0 OR publishClient.magicked = 0)
     -- WHERE hook %s
     ) AS publishToDo

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1494 +1494 @@
     product VARCHAR(64),             -- product name
     stage VARCHAR(64) NOT NULL, -- stage of interest (chip, camera, diff, etc.)
+    magicked TINYINT DEFAULT 1, -- Require magicked data?
     workdir VARCHAR(255) NOT NULL, -- working directory
     comment VARCHAR(255),            -- for human memory

trunk/ippTools/src/pubtool.c

@@ -95 +95 @@
     // optional
     PXOPT_LOOKUP_STR(comment, config->args, "-comment",  false, false);
-
-    if (!publishClientInsert(config->dbh, 0, 0, product, stage, workdir, comment)) {
+    PXOPT_LOOKUP_BOOL(unmagicked, config->args, "-unmagicked",  false);
+
+    if (!publishClientInsert(config->dbh, 0, 0, product, stage, !unmagicked, workdir, comment)) {
         psError(PS_ERR_UNKNOWN, false, "Database error");
         return false;

trunk/ippTools/src/pubtoolConfig.c

@@ -49 +49 @@
     psMetadataAddStr(defineclientArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL);
     psMetadataAddStr(defineclientArgs, PS_LIST_TAIL, "-comment", 0, "define comment", NULL);
+    psMetadataAddBool(defineclientArgs, PS_LIST_TAIL, "-unmagicked", 0, "allow unmagicked data?", false);
 
     // -updateclient