@@ -86,29 +86,29 @@
 (if (not (setup-for-run))
     (begin
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
-(define *db* #f) ;; (open-db))
-
-(if (args:get-arg "-host")
-    (begin
-      (set! *runremote* (string-split (args:get-arg "-host" ":")))
-      (client:launch))
-    (if (not (args:get-arg "-use-server"))
-	(set! *transport-type* 'fs) ;; force fs access
-	(client:launch)))
+(define *db* (open-db))
+
+;; (if (args:get-arg "-host")
+;;     (begin
+;;       (set! *runremote* (string-split (args:get-arg "-host" ":")))
+;;       (client:launch))
+;;     (if (not (args:get-arg "-use-server"))
+;; 	(set! *transport-type* 'fs) ;; force fs access
+;; 	(client:launch)))
 
 ;; HACK ALERT: this is a hack, please fix.
 (define *read-only* (not (file-read-access? (conc *toppath* "/megatest.db"))))
 ;; (client:setup *db*)
 
 (define toplevel #f)
 (define dlg      #f)
 (define max-test-num 0)
-;; (define *keys*   (open-run-close db:get-keys #f))
-(define *keys*   (cdb:remote-run db:get-keys #f))
+(define *keys*   (db:get-keys *db*))
+;; (define *keys*   (cdb:remote-run db:get-keys #f))
 ;; (define *keys*   (db:get-keys   *db*))
 
 (define *dbkeys*  (append *keys* (list "runname")))
 
 (define *header*       #f)
@@ -118,11 +118,11 @@
 
 (define *buttondat*    (make-hash-table)) ;; <run-id color text test run-key>
 (define *alltestnamelst* '())
 (define *searchpatts*  (make-hash-table))
 (define *num-runs*      8)
-(define *tot-run-count* (cdb:remote-run db:get-num-runs #f "%"))
+(define *tot-run-count* (db:get-num-runs *db* "%"))
 ;; (define *tot-run-count* (db:get-num-runs *db* "%"))
 
 ;; Update management
 ;;
 (define *last-update*   (current-seconds))
@@ -205,11 +205,11 @@
     (null? (filter (lambda (x)(> x 3)) delta))))
 
 ;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") )
 (define (update-rundat runnamepatt numruns testnamepatt keypatts)
   (let* ((referenced-run-ids '())
-	 (allruns     (cdb:remote-run db:get-runs #f runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2))
+	 (allruns     (db:get-runs *db* runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2))
 				      *start-run-offset* keypatts))
 	 (header      (db:get-header allruns))
 	 (runs        (db:get-rows   allruns))
 	 (result      '())
 	 (maxtests    0)
@@ -224,18 +224,19 @@
     ;; 
     ;; trim runs to only those that are changing often here
     ;; 
     (for-each (lambda (run)
 		(let* ((run-id      (db:get-value-by-header run header "id"))
-		       (tests       (mt:get-tests-for-run run-id testnamepatt states statuses
-							  not-in: *hide-not-hide*
-							  sort-by: sort-by
-							  sort-order: sort-order
-							  qryvals: 'shortlist))
+		       (tests       (db:get-tests-for-run *db* run-id testnamepatt states statuses
+							  #f #f
+							  *hide-not-hide*
+							  sort-by
+							  sort-order
+							  'shortlist))
 		       ;; NOTE: bubble-up also sets the global *all-item-test-names*
 		       ;; (tests       (bubble-up tmptests priority: bubble-type))
-		       (key-vals    (cdb:remote-run db:get-key-vals #f run-id)))
+		       (key-vals    (db:get-key-vals *db* run-id)))
 		  ;; NOTE: 11/01/2013 This routine is *NOT* getting called excessively.
 		  ;; (debug:print 0 "Getting data for run " run-id " with key-vals=" key-vals)
 		  ;; Not sure this is needed?
 		  (set! referenced-run-ids (cons run-id referenced-run-ids))
 		  (if (> (length tests) maxtests)
@@ -558,11 +559,11 @@
 		(iup:attribute-set! lb "VALUE" newval)
 		newval))))))
 
 (define (dashboard:update-target-selector key-lbs #!key (action-proc #f))
   (let* ((runconf-targs (common:get-runconfig-targets))
-	 (db-target-dat (open-run-close db:get-targets #f))
+	 (db-target-dat (db:get-targets *db*))
 	 (header        (vector-ref db-target-dat 0))
 	 (db-targets    (vector-ref db-target-dat 1))
 	 (all-targets   (append db-targets
 				(map (lambda (x)
 				       (list->vector
@@ -823,11 +824,11 @@
 					    (iup:attribute-set! tb "VALUE" val)
 					    (dboard:data-set-run-name! *data* val)
 					    (dashboard:update-run-command))))
 		(refresh-runs-list (lambda ()
 				     (let* ((target        (dboard:data-get-target-string *data*))
-					    (runs-for-targ (mt:get-runs-by-patt *keys* "%" target))
+					    (runs-for-targ (db:get-runs-by-patt *db* *keys* "%" target #f #f))
 					    (runs-header   (vector-ref runs-for-targ 0))
 					    (runs-dat      (vector-ref runs-for-targ 1))
 					    (run-names     (cons default-run-name 
 								 (map (lambda (x)
 									(db:get-value-by-header x runs-header "runname"))
@@ -983,11 +984,11 @@
 ;;======================================================================
 ;; S U M M A R Y 
 ;;======================================================================
 ;;
 ;; General info about the run(s) and megatest area
-(define (dashboard:summary)
+(define (dashboard:summary db)
   (let ((rawconfig        (read-config (conc *toppath* "/megatest.config") #f 'return-string)))
     (iup:vbox
      (iup:split
       ;; #:value 500
       (iup:frame 
@@ -1008,11 +1009,11 @@
 	;; (iup:frame
 	;; #:title "Disks Areas"
 	(dcommon:section-matrix rawconfig "disks" "Disk area" "Path"))))
      (iup:frame
       #:title "Run statistics"
-      (dcommon:run-stats)))))
+      (dcommon:run-stats db)))))
 
 ;;======================================================================
 ;; R U N
 ;;======================================================================
 ;;
@@ -1024,11 +1025,11 @@
       #f))
 
 (define dashboard:update-run-summary-tab #f)
 
 ;; (define (tests window-id)
-(define (dashboard:one-run)
+(define (dashboard:one-run db)
   (let* ((tb      (iup:treebox
 		   #:value 0
 		   #:name "Runs"
 		   #:expand "YES"
 		   #:addexpanded "NO"
@@ -1044,19 +1045,21 @@
 		       ;; (print "path: " (tree:node->path obj id) " run-id: " run-id)
 		       ))))
 	 (run-matrix (iup:matrix
 		      #:expand "YES"))
 	 (updater  (lambda ()
-		     (let* ((runs-dat     (mt:get-runs-by-patt *keys* "%" #f))
+		     (let* ((runs-dat     (db:get-runs-by-patt db *keys* "%" #f #f #f))
 			    (runs-header  (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records
 			    (run-id       (dboard:data-get-curr-run-id *data*))
-			    (tests-dat    (let ((tdat (mt:get-tests-for-run run-id 
+			    (tests-dat    (let ((tdat (db:get-tests-for-run db run-id 
 									    (hash-table-ref/default *searchpatts* "test-name" "%/%")
 									    (hash-table-keys *state-ignore-hash*) ;; '()
 									    (hash-table-keys *status-ignore-hash*) ;; '()
-									    not-in: *hide-not-hide*
-									    qryvals: "id,testname,item_path,state,status"))) ;; get 'em all
+									    #f #f
+									    *hide-not-hide*
+									    #f #f
+									    "id,testname,item_path,state,status"))) ;; get 'em all
 					    (sort tdat (lambda (a b)
 							 (let* ((aval (vector-ref a 2))
 								(bval (vector-ref b 2))
 								(anum (string->number aval))
 								(bnum (string->number bval)))
@@ -1169,11 +1172,11 @@
 
 ;;======================================================================
 ;; R U N S 
 ;;======================================================================
 
-(define (make-dashboard-buttons nruns ntests keynames)
+(define (make-dashboard-buttons db nruns ntests keynames)
   (let* ((nkeys   (length keynames))
 	 (runsvec (make-vector nruns))
 	 (header  (make-vector nruns))
 	 (lftcol  (make-vector ntests))
 	 (keycol  (make-vector ntests))
@@ -1243,21 +1246,21 @@
 						      (mark-for-update)
 						      (if (eq? val 1)
 							  (hash-table-set! *status-ignore-hash* status #t)
 							  (hash-table-delete! *status-ignore-hash* status))
 						      (set-bg-on-filter))))
-		   *common:std-statuses*)) ;; '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD" "n/a" "SKIP")))
+		   (map cadr *common:std-statuses*))) ;; '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD" "n/a" "SKIP")))
 	     (apply 
 	      iup:hbox
 	      (map (lambda (state)
 		     (iup:toggle state   #:action   (lambda (obj val)
 						      (mark-for-update)
 						      (if (eq? val 1)
 							  (hash-table-set! *state-ignore-hash* state #t)
 							  (hash-table-delete! *state-ignore-hash* state))
 						      (set-bg-on-filter))))
-		   *common:std-states*)) ;; '("RUNNING" "COMPLETED" "INCOMPLETE" "LAUNCHED" "NOT_STARTED" "KILLED" "DELETED")))
+		   (map cadr *common:std-states*))) ;; '("RUNNING" "COMPLETED" "INCOMPLETE" "LAUNCHED" "NOT_STARTED" "KILLED" "DELETED")))
 	     (iup:valuator #:valuechanged_cb (lambda (obj)
 					       (let ((val (inexact->exact (round (/ (string->number (iup:attribute obj "VALUE")) 10))))
 						     (oldmax   (string->number (iup:attribute obj "MAX")))
 						     (maxruns  *tot-run-count*))
 						 (set! *start-run-offset* val)
@@ -1380,13 +1383,13 @@
 			 controls))
 	     (tabs (iup:tabs
 		    #:tabchangepos-cb (lambda (obj curr prev)
 					(set! *please-update-buttons* #t)
 					(set! *current-tab-number* curr))
-		    (dashboard:summary)
+		    (dashboard:summary db)
 		    runs-view
-		    (dashboard:one-run)
+		    (dashboard:one-run db)
 		    (dashboard:run-controls)
 		    )))
 	;; (set! (iup:callback tabs tabchange-cb:) (lambda (a b c)(print "SWITCHED TO TAB: " a " " b " " c)))
 	(iup:attribute-set! tabs "TABTITLE0" "Summary")
 	(iup:attribute-set! tabs "TABTITLE1" "Runs")
@@ -1486,11 +1489,11 @@
     (if runid
 	(begin
 	  (lambda (x)
 	    (on-exit (lambda ()
 		       (if *db* (sqlite3:finalize! *db*))))
-	    (cdb:remote-run examine-run *db* runid)))
+	    (examine-run *db* runid)))
 	(begin
 	  (print "ERROR: runid is not a number " (args:get-arg "-run"))
 	  (exit 1)))))
  ((args:get-arg "-test")
   (let ((testid (string->number (args:get-arg "-test"))))
@@ -1501,11 +1504,11 @@
 	  (debug:print 3 "INFO: tried to open test with invalid test-id. " (args:get-arg "-test"))
 	  (exit 1)))))
  ((args:get-arg "-guimonitor")
   (gui-monitor *db*))
  (else
-  (set! uidat (make-dashboard-buttons *num-runs* *num-tests* *dbkeys*))
+  (set! uidat (make-dashboard-buttons *db* *num-runs* *num-tests* *dbkeys*))
   (iup:callback-set! *tim*
 		     "ACTION_CB"
 		     (lambda (x)
 		       (let ((update-is-running #f))
 			 (mutex-lock! *update-mutex*)
@@ -1520,5 +1523,6 @@
 			     (set! *update-is-running* #f)
 			     (mutex-unlock! *update-mutex*))))
 		       1))))
 
 (iup:main-loop)
+(sqlite3:finalize! *db*)