Changeset 27874 for trunk/ippTools/share

Timestamp:

May 6, 2010, 1:55:20 PM (16 years ago)

Author:

bills

Message:

Various changes to the postage stamp server and associated tables.
Implemented cleanup. Added pstampRequest.outdir changed spelling of out_dir
to outdir. various other cleanups

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• pstamptool_pendingcleanup.sql (added)
• pstamptool_pendingdependent.sql (modified) (1 diff)
• pstamptool_pendingreq.sql (modified) (1 diff)
• pstamptool_updatejob.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -226 +226 @@
      pstamptool_getdependent.sql \
      pstamptool_listjob.sql \
+     pstamptool_pendingcleanup.sql \
      pstamptool_pendingdependent.sql \
      pstamptool_pendingjob.sql \

trunk/ippTools/share/pstamptool_pendingdependent.sql

@@ -1 @@
-SELECT DISTINCT pstampDependent.*,
+SELECT DISTINCT
+    pstampDependent.*,
     IFNULL(Label.priority, 10000) AS priority
 FROM pstampDependent

trunk/ippTools/share/pstamptool_pendingreq.sql

@@ -4 +4 @@
     pstampDataStore.outProduct AS ds_outProduct,
     IFNULL(Label.priority, 10000) AS priority
-    FROM pstampRequest
+FROM pstampRequest
     LEFT JOIN pstampDataStore USING(ds_id)
     LEFT JOIN Label ON pstampRequest.label = Label.label

trunk/ippTools/share/pstamptool_updatejob.sql

@@ -1 +1 @@
 UPDATE pstampJob LEFT JOIN pstampDependent USING(dep_id)
-SET pstampJob.state = '%s'
-    -- set state hook %s
+SET 

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1303 +1303 @@
         outProduct VARCHAR(64),
         uri VARCHAR(255),
+        outdir     VARCHAR(255),
         fault SMALLINT,
         PRIMARY KEY(req_id),