Index: itemsmod.scm
==================================================================
--- itemsmod.scm
+++ itemsmod.scm
@@ -24,12 +24,13 @@
(module itemsmod
*
(import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable)
-(import commonmod (prefix mtconfigf configf:))
+(use (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable)
+(import commonmod)
+(import(prefix mtconfigf configf:))
;; (use (prefix ulex ulex:))
;; (include "common_records.scm")
;; (include "items-inc.scm")
Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -35,11 +35,11 @@
(import (prefix mtargs args:))
(import (prefix mtconfigf configf:))
(declare (uses apimod))
-(declare (uses commonmod))
+;; (declare (uses commonmod))
(declare (uses cookie))
(declare (uses dbmod))
(declare (uses ducttape-lib))
(declare (uses megamod))
(declare (uses mutils))
@@ -51,11 +51,11 @@
(declare (uses tasksmod))
(declare (uses testsmod))
(declare (uses ulex))
(import apimod)
-(import commonmod)
+;; (import commonmod)
(import cookie)
(import dbmod)
(import ducttape-lib)
(import megamod)
(import mutils)
@@ -67,11 +67,11 @@
(import testsmod)
(import ulex)
;; invoke the imports
(declare (uses apimod.import))
-(declare (uses commonmod.import))
+;; (declare (uses commonmod.import))
(declare (uses cookie.import))
(declare (uses dbmod))
(declare (uses ducttape-lib.import))
(declare (uses megamod.import))
(declare (uses mutils.import))
Index: mtmod.scm
==================================================================
--- mtmod.scm
+++ mtmod.scm
@@ -17,45 +17,46 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit mtmod))
-(declare (uses mtconfigf))
+
(declare (uses commonmod))
-(declare (uses rmtmod))
-(declare (uses testsmod))
-(declare (uses tasksmod))
+(declare (uses dbmod))
+(declare (uses launchmod))
(declare (uses mtargs))
-(declare (uses dbmod))
+(declare (uses mtconfigf))
(declare (uses pgdbmod))
+(declare (uses rmtmod))
(declare (uses servermod))
-(declare (uses launchmod))
+(declare (uses stml2))
(declare (uses subrunmod))
-(declare (uses stml2))
+(declare (uses tasksmod))
+(declare (uses testsmod))
(module mtmod
*
(import scheme chicken data-structures extras posix ports files)
-(import (prefix mtconfigf configf:)
- (prefix sqlite3 sqlite3:)
- srfi-69 regex srfi-18 srfi-13 srfi-1
- call-with-environment-variables z3 (prefix base64 base64:)
- typed-records
- csv
- commonmod
- rmtmod
- testsmod
- tasksmod
- dbmod
- pgdbmod
- servermod
- subrunmod
- stml2
- directory-utils
- (prefix mtargs args:))
+(use (prefix sqlite3 sqlite3:)
+ srfi-69 regex srfi-18 srfi-13 srfi-1
+ call-with-environment-variables z3 (prefix base64 base64:)
+ typed-records
+ csv directory-utils)
+
+(import (prefix mtargs args:))
+(import (prefix mtconfigf configf:))
+(import commonmod)
+(import dbmod)
+(import pgdbmod)
+(import rmtmod)
+(import servermod)
+(import stml2)
+(import subrunmod)
+(import tasksmod)
+(import testsmod)
(include "run_records.scm")
(include "db_records.scm")
(include "test_records.scm")
Index: pgdbmod.scm
==================================================================
--- pgdbmod.scm
+++ pgdbmod.scm
@@ -24,18 +24,18 @@
(declare (uses mtargs))
(module pgdbmod
*
-(import scheme chicken data-structures extras posix
- (prefix dbi dbi:)
- srfi-69 srfi-1 typed-records)
-
-(import (prefix mtconfigf configf:)
- (prefix mtargs args:)
- commonmod
- )
+(import scheme chicken data-structures extras files)
+(use posix
+ (prefix dbi dbi:)
+ srfi-69 srfi-1 typed-records)
+
+(import (prefix mtconfigf configf:))
+(import (prefix mtargs args:))
+(import commonmod)
;; given a configdat lookup the connection info and open the db
;;
(define (pgdb:open configdat #!key (dbname #f)(dbispec #f))
(let ((pgconf (or dbispec
Index: subrunmod.scm
==================================================================
--- subrunmod.scm
+++ subrunmod.scm
@@ -17,23 +17,25 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit subrunmod))
+
(declare (uses commonmod))
(declare (uses mtconfigf))
(module subrunmod
*
(import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18
+(use (prefix sqlite3 sqlite3:) posix typed-records srfi-18
srfi-69 format ports srfi-1 matchable irregex
call-with-environment-variables)
-(import
- commonmod
- (prefix mtconfigf configf:))
+
+(import commonmod)
+(import (prefix mtconfigf configf:))
+
;; (use (prefix ulex ulex:))
(include "common_records.scm")
;; strftime('%m/%d/%Y %H:%M:%S','now','localtime')