Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 27859)
+++ trunk/ippTools/share/Makefile.am	(revision 27874)
@@ -226,4 +226,5 @@
      pstamptool_getdependent.sql \
      pstamptool_listjob.sql \
+     pstamptool_pendingcleanup.sql \
      pstamptool_pendingdependent.sql \
      pstamptool_pendingjob.sql \
Index: trunk/ippTools/share/pstamptool_pendingcleanup.sql
===================================================================
--- trunk/ippTools/share/pstamptool_pendingcleanup.sql	(revision 27874)
+++ trunk/ippTools/share/pstamptool_pendingcleanup.sql	(revision 27874)
@@ -0,0 +1,9 @@
+-- postage stamp requests pending cleanup
+SELECT
+    pstampRequest.*,
+    IFNULL(Label.priority, 10000) AS priority
+FROM pstampRequest
+    LEFT JOIN Label ON pstampRequest.label = Label.label
+WHERE pstampRequest.state = 'goto_cleaned'
+    AND pstampRequest.fault = 0
+    AND (Label.active OR Label.active IS NULL)
Index: trunk/ippTools/share/pstamptool_pendingdependent.sql
===================================================================
--- trunk/ippTools/share/pstamptool_pendingdependent.sql	(revision 27859)
+++ trunk/ippTools/share/pstamptool_pendingdependent.sql	(revision 27874)
@@ -1,3 +1,4 @@
-SELECT DISTINCT pstampDependent.*,
+SELECT DISTINCT
+    pstampDependent.*,
     IFNULL(Label.priority, 10000) AS priority
 FROM pstampDependent
Index: trunk/ippTools/share/pstamptool_pendingreq.sql
===================================================================
--- trunk/ippTools/share/pstamptool_pendingreq.sql	(revision 27859)
+++ trunk/ippTools/share/pstamptool_pendingreq.sql	(revision 27874)
@@ -4,5 +4,5 @@
     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
Index: trunk/ippTools/share/pstamptool_updatejob.sql
===================================================================
--- trunk/ippTools/share/pstamptool_updatejob.sql	(revision 27859)
+++ trunk/ippTools/share/pstamptool_updatejob.sql	(revision 27874)
@@ -1,3 +1,2 @@
 UPDATE pstampJob LEFT JOIN pstampDependent USING(dep_id)
-SET pstampJob.state = '%s'
-    -- set state hook %s
+SET 
Index: trunk/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- trunk/ippTools/share/pxadmin_create_tables.sql	(revision 27859)
+++ trunk/ippTools/share/pxadmin_create_tables.sql	(revision 27874)
@@ -1303,4 +1303,5 @@
         outProduct VARCHAR(64),
         uri VARCHAR(255),
+        outdir     VARCHAR(255),
         fault SMALLINT,
         PRIMARY KEY(req_id),