Changeset 24428

Timestamp:

Jun 16, 2009, 10:21:18 AM (17 years ago)

Author:

Paul Price

Message:

Moving workdir under publishClient so it doesn't have to be defined for every run (which is going to run regularly under pantasks)

Location:

branches/pap_mops

Files:

• dbconfig/changes.txt (modified) (2 diffs)
• dbconfig/publish.md (modified) (2 diffs)
• ippTools/doc/publish_flow.txt (modified) (1 diff)
• ippTools/share/pubtool_pending.sql (modified) (2 diffs)
• ippTools/share/pxadmin_create_tables.sql (modified) (2 diffs)
• ippTools/src/pubtool.c (modified) (3 diffs)

branches/pap_mops/dbconfig/changes.txt

@@ -1128 +1128 @@
 
 -- Tables to support publishing of detections to a Science Client
+
 -- Clients to which we send stuff
 CREATE TABLE publishClient (
     client_id BIGINT AUTO_INCREMENT, -- unique identifier
+    product VARCHAR(64),             -- product name
+    stage VARCHAR(64) NOT NULL, -- stage of interest (chip, camera, diff, etc.)
+    workdir VARCHAR(255) NOT NULL, -- working directory
     comment VARCHAR(255),            -- for human memory
-    stage VARCHAR(64) NOT NULL, -- stage of interest (chip, camera, diff, etc.)
-    format VARCHAR(64),              -- format of data
-    destination VARCHAR(255) NOT NULL, -- where to send data
     PRIMARY KEY(client_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
@@ -1152 +1153 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 -- Publishing a file within a set
-CREATE TABLE publishFile (
+CREATE TABLE publishDone (
     pub_id BIGINT AUTO_INCREMENT, -- link to publishRun
-    component VARCHAR(64),        -- analagous to class_id or skycell_id
+    path_base VARCHAR(255),     -- base path of output
     fault SMALLINT NOT NULL DEFAULT 0, -- Fault code
-    PRIMARY KEY(pub_id, component),
-    KEY(component),
+    PRIMARY KEY(pub_id),
     KEY(fault),
     FOREIGN KEY(pub_id) REFERENCES publishRun(pub_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
+

branches/pap_mops/dbconfig/publish.md

@@ -5 +5 @@
     product     STR         64
     stage       STR         64
+    workdir     STR         255
     comment     STR         255
 END
@@ -12 +13 @@
     client_id   S64         0
     stage_id    S64         0
-    workdir     STR         255
     label       STR         64
     state       STR         64

branches/pap_mops/ippTools/doc/publish_flow.txt

@@ -1 +1 @@
 ### Setup
-pubtool -defineclient -stage diff -comment Comment -destination DataStore -format MOPS
+pubtool -defineclient -stage diff -comment Comment -product IPP-MOPS -workdir /path/to/somewhere
 
 ### Regularly run by pantasks to generate publishing runs based on data that has been processed
-pubtool -definerun -workdir /path/to/somewhere
+pubtool -definerun
 
 ### Regularly run by pantasks to get list of files to publish

branches/pap_mops/ippTools/share/pubtool_pending.sql

@@ -6 +6 @@
         publishClient.product,
         publishClient.stage,
-        diffRun.diff_id AS stage_id,
-        publishRun.workdir
+        publishClient.workdir,
+        diffRun.diff_id AS stage_id
     FROM publishRun
     JOIN publishClient USING(client_id)
@@ -21 +21 @@
         publishClient.product,
         publishClient.stage,
-        camRun.cam_id AS stage_id,
-        publishRun.workdir
+        publishClient.workdir,
+        camRun.cam_id AS stage_id
     FROM publishRun
     JOIN publishClient USING(client_id)

branches/pap_mops/ippTools/share/pxadmin_create_tables.sql

@@ -1376 +1376 @@
     product VARCHAR(64),             -- product name
     stage VARCHAR(64) NOT NULL, -- stage of interest (chip, camera, diff, etc.)
+    workdir VARCHAR(255) NOT NULL, -- working directory
     comment VARCHAR(255),            -- for human memory
     PRIMARY KEY(client_id)
@@ -1385 +1386 @@
     client_id BIGINT NOT NULL,  -- link to publishClient
     stage_id BIGINT NOT NULL,   -- link to various stage tables
-    workdir VARCHAR(255) NOT NULL, -- working directory
     label VARCHAR(64),          -- label for run
     state VARCHAR(64),          -- state of run (new, full, etc.)

branches/pap_mops/ippTools/src/pubtool.c

@@ -89 +89 @@
     PXOPT_LOOKUP_STR(product, config->args, "-product",  true, false);
     PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false);
+    PXOPT_LOOKUP_STR(workdir, config->args, "-workdir",  true, false);
 
     // optional
     PXOPT_LOOKUP_STR(comment, config->args, "-comment",  false, false);
 
-    if (!publishClientInsert(config->dbh, 0, product, stage, comment)) {
+    if (!publishClientInsert(config->dbh, 0, product, stage, workdir, comment)) {
         psError(PS_ERR_UNKNOWN, false, "Database error");
         return false;
@@ -108 +109 @@
 
     // required
-    PXOPT_LOOKUP_STR(workdir, config->args, "-workdir",  true, false);
 
     // optional
@@ -171 +171 @@
         psS64 stage = psMetadataLookupS64(NULL, row, "stage_id");   // Stage identifier
 
-        if (!publishRunInsert(config->dbh, 0, client, stage, workdir, set_label, "new")) {
+        if (!publishRunInsert(config->dbh, 0, client, stage, set_label, "new")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to add fileset");
             psFree(output);