@@ -20,32 +20,41 @@
 
 ;;======================================================================
 ;; Database access
 ;;======================================================================
 
-(require-extension (srfi 18) extras tcp)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64)
-(import (prefix sqlite3 sqlite3:))
-(import (prefix base64 base64:))
-
 (declare (unit tdb))
 (declare (uses common))
 (declare (uses client))
 (declare (uses mt))
 (declare (uses db))
 (declare (uses margsmod))
-(import margsmod)
-
 (declare (uses commonmod))
 (declare (uses debugprint))
+(declare (uses dbmod))
+(declare (uses ods))
+
+(module tdb
+	*
+
+(import scheme chicken data-structures extras ports)
+
+(import (srfi 18) extras tcp)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64)
+
+
+
+(import (prefix sqlite3 sqlite3:))
+(import (prefix base64 base64:))
+
+(import margsmod)
+
 (import commonmod)
 (import debugprint)
 
-(declare (uses dbmod))
 (import dbmod)
 
-(declare (uses ods))
 (import ods)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
@@ -161,18 +170,10 @@
  	(debug:print-info 11 *default-log-port* "open-test-db END (unsucessful)" work-area)
  	;; provide an in-mem db (this is dangerous!)
  	(tdb:testdb-initialize baddb)
  	baddb)))
 
-;; find and open the testdat.db file for an existing test
-(define (tdb:open-test-db-by-test-id test-id #!key (work-area #f))
-  (let* ((test-path (if work-area
-			work-area
-			(rmt:test-get-rundir-from-test-id test-id))))
-    (debug:print 3 *default-log-port* "TEST PATH: " test-path)
-    (open-test-db test-path)))
-
 ;; find and open the testdat.db file for an existing test
 (define (tdb:open-test-db-by-test-id-local dbstruct run-id test-id #!key (work-area #f))
   (let* ((test-path (if work-area
 			work-area
 			(db:test-get-rundir-from-test-id dbstruct run-id test-id))))
@@ -264,38 +265,10 @@
 ;; 	   "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
 ;; 	  (sqlite3:finalize! tdb)
 ;; 	  (reverse res))
 ;; 	'())))
 
-;; NOTE: Run this local with #f for db !!!
-(define (tdb:load-test-data run-id test-id)
-  (let loop ((lin (read-line)))
-    (if (not (eof-object? lin))
-	(begin
-	  (debug:print 4 *default-log-port* lin)
-          ;;(when lin ;; this when blocked stack dump caused by .dat file from logpro being 0-byte.  fixed by upgrading logpro
-          (rmt:csv->test-data run-id test-id lin)
-          ;;)
-	  (loop (read-line)))))
-  ;; roll up the current results.
-  ;; FIXME: Add the status too 
-  (rmt:test-data-rollup run-id test-id #f))
-
-;; NOTE: Run this local with #f for db !!!
-(define (tdb:load-logpro-data run-id test-id)
-  (let loop ((lin (read-line)))
-    (if (not (eof-object? lin))
-	(begin
-	  (debug:print 4 *default-log-port* lin)
-          ;;(when lin  ;; this when blocked stack dump caused by .dat file from logpro being 0-byte.  fixed by upgrading logpro
-          (rmt:csv->test-data run-id test-id lin)
-          ;;)
-	  (loop (read-line)))))
-  ;; roll up the current results.
-  ;; FIXME: Add the status too 
-  (rmt:test-data-rollup run-id test-id #f))
-
 ;;======================================================================
 ;; S T E P S 
 ;;======================================================================
 
 (define (tdb:step-get-time-as-string vec)
@@ -449,14 +422,15 @@
 				       (conc (vector-ref b 2)))
 			     #f))
 		     (string<? (conc time-a)(conc time-b))))))))
 
 ;; 
-(define (tdb:remote-update-testdat-meta-info run-id test-id work-area cpuload diskfree minutes)
+#;(define (tdb:remote-update-testdat-meta-info run-id test-id work-area cpuload diskfree minutes)
   (let ((tdb         (rmt:open-test-db-by-test-id run-id test-id work-area: work-area)))
     (if (sqlite3:database? tdb)
 	(begin
 	  (sqlite3:execute tdb "INSERT INTO test_rundat (update_time,cpuload,diskfree,run_duration) VALUES (strftime('%s','now'),?,?,?);"
 			   cpuload diskfree minutes)
 	  (sqlite3:finalize! tdb))
 	(debug:print 2 *default-log-port* "Can't update testdat.db for test " test-id " read-only or non-existant"))))
     
+)