@@ -20,27 +20,27 @@
 
 ;;======================================================================
 ;; 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 keys))
-(declare (uses ods))
-(declare (uses client))
-(declare (uses mt))
-(declare (uses db))
-
-(include "common_records.scm")
-(include "db_records.scm")
-(include "key_records.scm")
-(include "run_records.scm")
+;; (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 keys))
+;; (declare (uses ods))
+;; (declare (uses client))
+;; (declare (uses mt))
+;; (declare (uses db))
+;; 
+;; (include "common_records.scm")
+;; (include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "run_records.scm")
 
 ;;======================================================================
 ;;
 ;; T E S T   D A T A B A S E S
 ;;
@@ -57,14 +57,14 @@
 ;;
 (define (open-test-db work-area) 
   (debug:print-info 11 *default-log-port* "open-test-db " work-area)
   (if (and work-area 
 	   (directory? work-area)
-	   (file-read-access? work-area))
+	   (file-readable? work-area))
       (let* ((dbpath              (conc work-area "/testdat.db"))
 	     (dbexists            (common:file-exists? dbpath))
-	     (work-area-writeable (file-write-access? work-area))
+	     (work-area-writeable (file-writable? work-area))
 	     (db                  (handle-exceptions  ;; open the db if area writeable or db pre-existing. open in-mem otherwise. if exception, open in-mem
 				   exn
 				   (begin
 				     (print-call-chain (current-error-port))
 				     (debug:print 2 *default-log-port* "ERROR: problem accessing test db " work-area ", you probably should clean and re-run this test"
@@ -73,12 +73,12 @@
 				     (sqlite3:open-database ":memory:")) ;; open an in-memory db to allow readonly access 
 				   (if (or work-area-writeable
 					   dbexists)
 				       (sqlite3:open-database dbpath)
 				       (sqlite3:open-database ":memory:"))))
-	     (tdb-writeable       (and (file-write-access? work-area)
-				       (file-write-access? dbpath)))
+	     (tdb-writeable       (and (file-writable? work-area)
+				       (file-writable? dbpath)))
 	     (handler   (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
 						       (string->number (args:get-arg "-override-timeout"))
 						       136000))))
 	
 	(if (and tdb-writeable