Changeset 24377

Timestamp:

Jun 10, 2009, 5:49:03 PM (17 years ago)

Author:

Paul Price

Message:

Defining modes for pubtool and dreamed up workflow. Haven't yet defined SQL or the C code for implementing the modes. Made some changes to the database schema for publishing.

Location:

branches/pap_mops

Files:

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

branches/pap_mops/dbconfig/changes.txt

@@ -1132 +1132 @@
     client_id BIGINT AUTO_INCREMENT, -- unique identifier
     comment VARCHAR(255),            -- for human memory
-    stage VARCHAR(64),               -- stage of interest (chip, camera, diff, etc.)
+    stage VARCHAR(64) NOT NULL, -- stage of interest (chip, camera, diff, etc.)
     format VARCHAR(64),              -- format of data
-    destination VARCHAR(255),        -- where to send data
+    destination VARCHAR(255) NOT NULL, -- where to send data
     PRIMARY KEY(client_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
@@ -1140 +1140 @@
 CREATE TABLE publishRun (
     pub_id BIGINT AUTO_INCREMENT, -- unique identifier
-    client_id BIGINT,             -- link to publishClient
-    stage_id BIGINT,              -- link to various stage tables
+    client_id BIGINT NOT NULL,  -- link to publishClient
+    stage_id BIGINT NOT NULL,   -- link to various stage tables
+    label VARCHAR(64),          -- label for run
+    state VARCHAR(64),          -- state of run (new, full, etc.)
     PRIMARY KEY(pub_id),
     KEY(client_id),
     KEY(stage_id),
+    KEY(label),
+    KEY(state),
     FOREIGN KEY(client_id) REFERENCES publishClient(client_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;

branches/pap_mops/dbconfig/publish.md

@@ -13 +13 @@
     client_id   S64         0
     stage_id    S64         0
+    label       STR         64
     state       STR         64
 END

branches/pap_mops/ippTools/share/pxadmin_create_tables.sql

@@ -1375 +1375 @@
     client_id BIGINT AUTO_INCREMENT, -- unique identifier
     comment VARCHAR(255),            -- for human memory
-    stage VARCHAR(64),               -- stage of interest (chip, camera, diff, etc.)
+    stage VARCHAR(64) NOT NULL, -- stage of interest (chip, camera, diff, etc.)
     format VARCHAR(64),              -- format of data
-    destination VARCHAR(255),        -- where to send data
+    destination VARCHAR(255) NOT NULL, -- where to send data
     PRIMARY KEY(client_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
@@ -1384 +1384 @@
 CREATE TABLE publishRun (
     pub_id BIGINT AUTO_INCREMENT, -- unique identifier
-    client_id BIGINT,             -- link to publishClient
-    stage_id BIGINT,              -- link to various stage tables
+    client_id BIGINT NOT NULL,  -- link to publishClient
+    stage_id BIGINT NOT NULL,   -- link to various stage tables
+    label VARCHAR(64),          -- label for run
+    state VARCHAR(64),          -- state of run (new, full, etc.)
     PRIMARY KEY(pub_id),
     KEY(client_id),
     KEY(stage_id),
+    KEY(label),
+    KEY(state),
     FOREIGN KEY(client_id) REFERENCES publishClient(client_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;

branches/pap_mops/ippTools/src/Makefile.am

@@ -20 +20 @@
         stacktool \
         warptool \
-        receivetool
+        receivetool \
+        pubtool
 
 
@@ -59 +60 @@
         regtool.h \
         stacktool.h \
-        warptool.h
+        warptool.h \
+        pubtool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -220 +222 @@
     receivetoolConfig.c
 
+pubtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+pubtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+pubtool_SOURCES = \
+    pubtool.c \
+    pubtoolConfig.c
+
 clean-local:
         -rm -f TAGS