@@ -21,10 +21,13 @@
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18)
 
 (declare (unit archive))
 (declare (uses db))
 (declare (uses common))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;;======================================================================
@@ -132,11 +135,11 @@
 (define (archive:run-bup archive-command run-id run-name tests rp-mutex bup-mutex)
   ;; move the getting of archive space down into the below block so that a single run can 
   ;; allocate as needed should a disk fill up
   ;;
   (let* ((blockid-cache  (make-hash-table))
-	 (tsname         (common:get-area-name))
+	 (tsname         (common:get-area-name *alldat*))
 	 (min-space      (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000")))
 	 (arch-groups    (make-hash-table)) ;; archive groups, each corrosponds to a bup area
 	 (disk-groups    (make-hash-table)) ;; 
 	 (test-groups    (make-hash-table)) ;; these two (disk and test groups) could be combined nicely
 	 (test-dirs      (make-hash-table))
@@ -255,11 +258,11 @@
 	     ((bup) ;; Archive using bup
 	      (let* ((bup-init-params  (list "-d" archive-dir "init"))
 		     (bup-index-params (append (list "-d" archive-dir "index") test-paths))
 		     (bup-save-params  (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree)
 						     (conc "-" compress) ;; or (conc "--compress=" compress)
-						     "-n" (conc (common:get-area-name) "-" run-id)
+						     "-n" (conc (common:get-area-name *alldat*) "-" run-id)
 						     (conc "--strip-path=" test-base) ;; if we push to the directory do we need this?
 						     )
 					       test-paths)))
 		(if (not (common:file-exists? (conc archive-dir "/HEAD")))
 		    (begin
@@ -343,11 +346,11 @@
 	      (archive-block-id        (db:test-get-archived test-dat))
 	      (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
 	      (archive-path            (if (vector? archive-block-info)
 					   (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info
 					   #f)) ;; no archive found?
-	      (archive-internal-path   (conc (common:get-area-name) "-" run-id "/latest/" test-partial-path)))
+	      (archive-internal-path   (conc (common:get-area-name *alldat*) "-" run-id "/latest/" test-partial-path)))
 	 
 	 ;; some sanity checks, move an existing path out of the way - iif it is not a toplevel with children
 	 ;;
 	 (if (and (not toplevel/children)  ;; special handling needed for toplevel with children
 		  prev-test-physical-path