Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -631,14 +631,25 @@
 	  (sqlite3:execute tdb "DELETE FROM test_steps;")
 	  (sqlite3:execute tdb "DELETE FROM test_data;")
 	  (sqlite3:finalize! tdb)))))
 
 ;; 
-(define (db:delete-test-records db test-id)
-  (sqlite3:execute db "DELETE FROM test_steps WHERE test_id=?;" test-id)
-  (sqlite3:execute db "DELETE FROM test_data  WHERE test_id=?;" test-id)
-  (sqlite3:execute db "DELETE FROM tests WHERE id=?;" test-id))
+(define (db:delete-test-records db tdb test-id)
+  (if tdb 
+      (begin
+	(sqlite3:execute tdb "DELETE FROM test_steps;")
+	(sqlite3:execute tdb "DELETE FROM test_data;")))
+  ;; (sqlite3:execute db "DELETE FROM tests WHERE id=?;" test-id))
+  (if db 
+      (begin
+	(sqlite3:execute db "DELETE FROM test_steps WHERE test_id=?;" test-id)
+	(sqlite3:execute db "DELETE FROM test_data  WHERE test_id=?;" test-id)
+	(sqlite3:execute db "UPDATE tests SET state='DELETED',status='n/a' WHERE test_id=?;" test-id))))
+
+(define (db:delete-old-deleted-test-records db)
+  (let ((targtime (- (current-seconds)(* 30 24 60 60)))) ;; one month in the past
+    (sqlite3:exectute db "DELETE FROM tests WHERE state='DELETED' AND event_time<?;" targtime)))
 
 ;; set tests with state currstate and status currstatus to newstate and newstatus
 ;; use currstate = #f and or currstatus = #f to apply to any state or status respectively
 ;; WARNING: SQL injection risk
 (define (db:set-tests-state-status db run-id testnames currstate currstatus newstate newstatus)
@@ -702,11 +713,11 @@
      db ;; NB// KILLREQ means the jobs is still probably running
      "SELECT count(id) FROM tests WHERE state in ('LAUNCHED','NOT_STARTED','REMOTEHOSTSTART','RUNNING','KILLREQ') AND run_id=?;" run-id)
     res))
 
 ;; map run-id, testname item-path to test-id
-(define (db:get-test-cached-id db run-id testname item-path)
+(define (db:get-test-id-cached db run-id testname item-path)
   (let* ((test-key (conc run-id "-" testname "-" item-path))
 	 (res      (hash-table-ref/default *test-ids* test-key #f)))
     (if res 
 	res
 	(begin
@@ -718,19 +729,21 @@
 	   run-id testname item-path)
 	  (hash-table-set! *test-ids* test-key res)
 	  res))))
 
 ;; map run-id, testname item-path to test-id
-(define (db:get-test-id db run-id testname item-path)
+(define (db:get-test-id-not-cached db run-id testname item-path)
   (let* ((res #f))
     (sqlite3:for-each-row
      (lambda (id) ;;  run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment )
        (set! res id)) ;; (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment )))
      db 
      "SELECT id FROM tests WHERE run_id=? AND testname=? AND item_path=?;"
      run-id testname item-path)
     res))
+
+(define db:get-test-id db:get-test-id-cached)
 
 ;; given a test-info record, patch in the latest data from the testdat.db file
 ;; found in the test run directory
 (define (db:patch-tdb-data-into-test-info db test-id res)
   (let ((tdb (db:open-test-db-by-test-id db test-id)))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -580,12 +580,12 @@
 							  (list 'env-ovrd  (hash-table-ref/default *configdat* "env-override" '())) 
 							  (list 'set-vars  (if params (hash-table-ref/default params "-setvars" #f)))
 							  (list 'runname   runname)
 							  (list 'mt-bindir-path mt-bindir-path))))))) ;; (string-intersperse keyvallst " "))))
     ;; clean out step records from previous run if they exist
-    (print "FIXMEEEEE!!!!")
-    ;; (db:delete-test-step-records db test-id)
+    (debug:print 4 "INFO: FIXMEEEEE!!!! This can be removed some day, perhaps move all test records to the test db?")
+    (db:delete-test-step-records db test-id)
     (change-directory work-area) ;; so that log files from the launch process don't clutter the test dir
     (open-run-close test-set-status! db test-id "LAUNCHED" "n/a" #f #f) ;; (if launch-results launch-results "FAILED"))
     (cond
      ((and launcher hosts) ;; must be using ssh hostname
       (set! fullcmd (append launcher (car hosts)(list remote-megatest test-sig "-execute" cmdparms) debug-param)))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -671,11 +671,11 @@
 						(db:get-value-by-header run header (vector-ref k 0))) keys) "/"))
 	     (dirs-to-remove (make-hash-table)))
 	 (let* ((run-id    (db:get-value-by-header run header "id"))
 		(run-state (db:get-value-by-header run header "state"))
 		(tests     (if (not (equal? run-state "locked"))
-			       (rdb:get-tests-for-run db (db:get-value-by-header run header "id")
+			       (db:get-tests-for-run db (db:get-value-by-header run header "id")
 						      testpatt itempatt states statuses
 						      not-in:  #f
 						      sort-by: (case action
 								 ((remove-runs) 'rundir)
 								 (else          'event_time)))
@@ -693,15 +693,17 @@
 		    (print "INFO: action not recognised " action)))
 		 (for-each
 		  (lambda (test)
 		    (let* ((item-path (db:test-get-item-path test))
 			   (test-name (db:test-get-testname test))
-			   (run-dir   (db:test-get-rundir test)))
+			   (run-dir   (db:test-get-rundir test))
+			   (test-id   (db:test-get-id test)))
+		      ;;   (tdb       (db:open-test-db run-dir)))
 		      (debug:print 1 "  " (db:test-get-testname test) " id: " (db:test-get-id test) " " item-path " action: " action)
 		      (case action
-			((remove-runs)
-			 (rdb:delete-test-records db (db:test-get-id test))
+			((remove-runs) ;; the tdb is for future possible. 
+			 (db:delete-test-records db #f (db:test-get-id test))
 			 (debug:print 1 "INFO: Attempting to remove dir " run-dir)
 			 (if (and (> (string-length run-dir) 5)
 				  (file-exists? run-dir)) ;; bad heuristic but should prevent /tmp /home etc.
 			     (let* ((realpath (resolve-pathname run-dir)))
 			       (debug:print 1 "INFO: Real path of is " realpath)
@@ -719,23 +721,25 @@
 					   (debug:print 0 "ERROR: refusing to remove " run-dir " as it is neither a symlink nor a directory")
 					   ))))
 			     (debug:print 0 "WARNING: directory already removed " run-dir)))
 			((set-state-status)
 			 (debug:print 2 "INFO: new state " (car state-status) ", new status " (cadr state-status))
-			 (db:test-set-state-status-by-id db (db:test-get-id test) (car state-status)(cadr state-status) #f)))))
+			 (open-run-close db:test-set-state-status-by-id db (db:test-get-id test) (car state-status)(cadr state-status) #f)))))
 		  tests)))
 	   
 	   ;; remove the run if zero tests remain
 	   (if (eq? action 'remove-runs)
-	       (let ((remtests (rdb:get-tests-for-run db (db:get-value-by-header run header "id") #f #f '() '())))
+	       (let ((remtests (db:get-tests-for-run db (db:get-value-by-header run header "id") #f #f '() '())))
 		 (if (null? remtests) ;; no more tests remaining
 		     (let* ((dparts  (string-split lasttpath "/"))
 			    (runpath (conc "/" (string-intersperse 
 						(take dparts (- (length dparts) 1))
 						"/"))))
 		       (debug:print 1 "Removing run: " runkey " " (db:get-value-by-header run header "runname"))
 		       (db:delete-run db run-id)
+		       ;; This is a pretty good place to purge old DELETED tests
+		       (db:delete-old-deleted-test-records db)
 		       ;; need to figure out the path to the run dir and remove it if empty
 		       ;;    (if (null? (glob (conc runpath "/*")))
 		       ;;        (begin
 		       ;; 	 (debug:print 1 "Removing run dir " runpath)
 		       ;; 	 (system (conc "rmdir -p " runpath))))