Changeset 27856 for trunk/ippTools/share

Timestamp:

May 4, 2010, 10:50:29 AM (16 years ago)

Author:

bills

Message:

Add table Label which through priority column may be used to order
items pending for processing.
Implement usage of this table in the pstamptool pending modes and
chiptool -pendingimfile.
Various other postage stamp changes including adding pstampDependent.outdir

Location:

trunk/ippTools/share

Files:

• chiptool_pendingimfile.sql (modified) (3 diffs)
• pstamptool_completedreq.sql (modified) (1 diff)
• pstamptool_getdependent.sql (modified) (1 diff)
• pstamptool_pendingdependent.sql (modified) (1 diff)
• pstamptool_pendingjob.sql (modified) (2 diffs)
• pstamptool_pendingreq.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (2 diffs)
• pxadmin_drop_tables.sql (modified) (1 diff)

trunk/ippTools/share/chiptool_pendingimfile.sql

@@ -10 +10 @@
     rawExp.camera,
     rawExp.telescope,
-    rawExp.filelevel
+    rawExp.filelevel,
+    IFNULL(Label.priority, 10000) AS priority
 FROM chipRun
 JOIN rawExp
@@ -25 +26 @@
 LEFT JOIN chipMask
     ON chipRun.label = chipMask.label
+LEFT JOIN Label ON chipRun.label = Label.label
 WHERE
     ((chipRun.state = 'new'
@@ -35 +37 @@
     AND chipProcessedImfile.data_state = 'update'
     AND chipProcessedImfile.fault = 0))
+    AND (Label.active OR Label.active IS NULL)

trunk/ippTools/share/pstamptool_completedreq.sql

@@ -1 @@
-SELECT * 
+SELECT pstampRequest.* ,
+    IFNULL(labels.priority, 0) AS priority
 FROM pstampRequest 
+    LEFT JOIN labels USING(label) 
 WHERE state = 'run'
     AND (

trunk/ippTools/share/pstamptool_getdependent.sql

@@ -1 +1 @@
 SELECT DISTINCT pstampDependent.*
 FROM pstampDependent
-JOIN pstampJob USING(dep_id)
-JOIN pstampRequest USING(req_id)
+-- JOIN pstampJob USING(dep_id)
+-- JOIN pstampRequest USING(req_id)
 WHERE pstampDependent.state = 'new'

trunk/ippTools/share/pstamptool_pendingdependent.sql

@@ -1 @@
-SELECT DISTINCT pstampDependent.*
+SELECT DISTINCT pstampDependent.*,
+    IFNULL(Label.priority, 10000) AS priority
 FROM pstampDependent
 JOIN pstampJob USING(dep_id)
 JOIN pstampRequest USING(req_id)
+JOIN Label ON pstampRequest.label = Label.label
 WHERE pstampDependent.state = 'new'
     AND pstampDependent.fault = 0
     AND pstampJob.state = 'run'
     AND pstampRequest.state = 'run'
+    AND (Label.active OR Label.active IS NULL)

trunk/ippTools/share/pstamptool_pendingjob.sql

@@ -1 @@
-SELECT pstampJob.*
+SELECT pstampJob.*,
+    IFNULL(Label.priority, 10000) AS priority
 FROM pstampJob
     JOIN pstampRequest USING(req_id)
     LEFT JOIN pstampDependent USING(dep_id)
+    LEFT JOIN Label ON pstampRequest.label = Label.label
 WHERE pstampRequest.state = 'run'
     AND pstampRequest.fault = 0
@@ -8 +10 @@
     AND pstampJob.fault = 0
     AND (dep_id = 0 OR pstampDependent.state = 'full')
+    AND (Label.active OR Label.active IS NULL)

trunk/ippTools/share/pstamptool_pendingreq.sql

@@ -1 +1 @@
 -- postage stamp requests ready for download and parsing
 SELECT
- pstampRequest.*,
- pstampDataStore.outProduct as ds_outProduct
- FROM pstampRequest
- LEFT JOIN pstampDataStore
-    USING(ds_id)
- WHERE pstampRequest.state = 'new'
+    pstampRequest.*,
+    pstampDataStore.outProduct AS ds_outProduct,
+    IFNULL(Label.priority, 10000) AS priority
+    FROM pstampRequest
+    LEFT JOIN pstampDataStore USING(ds_id)
+    LEFT JOIN Label ON pstampRequest.label = Label.label
+WHERE pstampRequest.state = 'new'
     AND pstampRequest.fault = 0
+    AND (Label.active OR Label.active IS NULL)

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1332 +1332 @@
         imagedb    VARCHAR(64),
         rlabel     VARCHAR(64),
+        outdir     VARCHAR(255),
         need_magic TINYINT,
         PRIMARY KEY(dep_id),
@@ -1599 +1600 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE Label (
+    label       VARCHAR(64),
+    priority    INT,
+    active      TINYINT,
+    comment     VARCHAR(80),
+    PRIMARY KEY(label),
+    KEY(priority),
+    KEY(active)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 -- This comment line is here to avoid empty query error.
 -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.

trunk/ippTools/share/pxadmin_drop_tables.sql

@@ -84 +84 @@
 DROP TABLE IF EXISTS staticskyResult;
 DROP TABLE IF EXISTS staticskyRun;
+DROP TABLE IF EXISTS Label;
 
 SET FOREIGN_KEY_CHECKS=1