Changeset 26446 for trunk/ippTools

Timestamp:

Dec 16, 2009, 3:57:48 PM (17 years ago)

Author:

bills

Message:

Add some stats to magicDSFile.
On the receive side, make it possible to disable a source

Location:

trunk/ippTools/share

Files:

• pxadmin_create_tables.sql (modified) (2 diffs)
• receivetool_list.sql (modified) (1 diff)
• receivetool_pendingfile.sql (modified) (1 diff)
• receivetool_pendingfileset.sql (modified) (1 diff)
• receivetool_toadvance.sql (modified) (1 diff)

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1181 +1181 @@
     backup_path_base VARCHAR(255),
     recovery_path_base VARCHAR(255),
+    streak_frac FLOAT,
+    run_time FLOAT,
     fault SMALLINT,
     data_state VARCHAR(64),
@@ -1428 +1430 @@
     product VARCHAR(64) NOT NULL, -- product of interest
     workdir VARCHAR(255) NOT NULL, -- where to extract
+    state VARCHAR(64) NOT NULL, -- state 'enabled' or 'disabled'
     comment VARCHAR(255),       -- for human memory
     fileset_last VARCHAR(128),  -- last fileset seen

trunk/ippTools/share/receivetool_list.sql

@@ -1 +1 @@
 SELECT *
 FROM receiveSource
+WHERE receiveSource.state = 'enabled'

trunk/ippTools/share/receivetool_pendingfile.sql

@@ -18 +18 @@
     ON receiveResult.file_id = receiveFile.file_id
 WHERE
-    ((receiveFileset.state = 'new')
+    receiveSource.state = 'enabled'
+    AND ((receiveFileset.state = 'new')
     OR (receiveFileset.state = 'listed' AND receiveFile.component = 'dirinfo' AND receiveFileset.dirinfo IS NULL))
     AND receiveFileset.fault = 0

trunk/ippTools/share/receivetool_pendingfileset.sql

@@ -1 @@
-SELECT *
+SELECT receiveFileset.*,
+    receiveSource.source,
+    receiveSource.product,
+    receiveSource.workdir
 FROM receiveFileset
 JOIN receiveSource USING(source_id)
 LEFT JOIN receiveFile USING(fileset_id)
-WHERE receiveFileset.state = 'reg'
+WHERE receiveSource.state = 'enabled'
+    AND receiveFileset.state = 'reg'
     AND receiveFileset.fault = 0
     AND receiveFile.fileset_id IS NULL

trunk/ippTools/share/receivetool_toadvance.sql

@@ -10 +10 @@
     JOIN receiveFile USING(fileset_id)
     LEFT JOIN receiveResult USING(file_id)
-WHERE receiveFileset.state = 'new' 
+WHERE receiveSource.state = 'enabled'
+    AND receiveFileset.state = 'new' 
     AND receiveFileset.fault = 0
 GROUP BY fileset_id