@@ -44,11 +44,11 @@
 (include "megatest-fossil-hash.scm")
 
 (define help (conc 
 "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
-  license GPL, Copyright (C) Matt Welland 2013
+  license GPL, Copyright (C) Matt Welland 2012-2014
 
 Usage: dashboard [options]
   -h                   : this help
   -server host:port    : connect to host:port instead of db access
   -test run-id,test-id : control test identified by testid
@@ -86,11 +86,11 @@
 (if (not (setup-for-run))
     (begin
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
-(define *db*  (make-dbr:dbstruct path: *toppath* local: #t))
+(define *dbstruct-local*  (make-dbr:dbstruct path: *toppath* local: #t))
 
 ;; (define sdb:qry (make-sdb:qry)) ;;  'init #f)
 
 ;; (if (args:get-arg "-host")
 ;;     (begin
@@ -99,19 +99,19 @@
 ;;     (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 *read-only* (not (file-read-access? (conc *toppath* "db/main.db"))))
+;; (client:setup *dbstruct-local*)
 
 (define toplevel #f)
 (define dlg      #f)
 (define max-test-num 0)
-(define *keys*   (db:get-keys *db*))
+(define *keys*   (db:get-keys *dbstruct-local*))
 ;; (define *keys*   (cdb:remote-run db:get-keys #f))
-;; (define *keys*   (db:get-keys   *db*))
+;; (define *keys*   (db:get-keys   *dbstruct-local*))
 
 (define *dbkeys*  (append *keys* (list "runname")))
 
 (define *header*       #f)
 (define *allruns*     '())
@@ -120,12 +120,12 @@
 
 (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* (db:get-num-runs *db* "%"))
-;; (define *tot-run-count* (db:get-num-runs *db* "%"))
+(define *tot-run-count* (db:get-num-runs *dbstruct-local* "%"))
+;; (define *tot-run-count* (db:get-num-runs *dbstruct-local* "%"))
 
 ;; Update management
 ;;
 (define *last-update*   (current-seconds))
 (define *last-db-update-time* 0)
@@ -207,11 +207,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     (db:get-runs *db* runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2))
+	 (allruns     (db:get-runs *dbstruct-local* runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2))
 				      *start-run-offset* keypatts))
 	 (header      (db:get-header allruns))
 	 (runs        (db:get-rows   allruns))
 	 (result      '())
 	 (maxtests    0)
@@ -226,19 +226,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       (db:get-tests-for-run *db* run-id testnamepatt states statuses
+		       (tests       (db:get-tests-for-run *dbstruct-local* 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    (db:get-key-vals *db* run-id)))
+		       (key-vals    (db:get-key-vals *dbstruct-local* 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)
@@ -561,11 +561,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 (db:get-targets *db*))
+	 (db-target-dat (db:get-targets *dbstruct-local*))
 	 (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
@@ -826,11 +826,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 (db:get-runs-by-patt *db* *keys* "%" target #f #f))
+					    (runs-for-targ (db:get-runs-by-patt *dbstruct-local* *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"))
@@ -1219,11 +1219,11 @@
 							       (iup:attribute-set! obj "TITLE" (if *hide-not-hide* "HideTests" "NotHide"))
 							       (mark-for-update)))))
 		(set! *hide-not-hide-button* hideit)
 		hideit))
 	     (iup:hbox
-	      (iup:button "Quit"      #:action (lambda (obj)(if *db* (db:close-all *db*))(exit)))
+	      (iup:button "Quit"      #:action (lambda (obj)(if *dbstruct-local* (db:close-all *dbstruct-local*))(exit)))
 	      (iup:button "Refresh"   #:action (lambda (obj)
 						 (mark-for-update)))
 	      (iup:button "Collapse"  #:action (lambda (obj)
 						 (let ((myname (iup:attribute obj "TITLE")))
 						   (if (equal? myname "Collapse")
@@ -1438,12 +1438,17 @@
 
 ;; Force creation of the db in case it isn't already there.
 (let ((db (tasks:open-db)))
   (sqlite3:finalize! db))
 
+(define (dashboard:get-youngest-run-db-mod-time)
+  (apply max (map (lambda (filen)
+		    (file-modification-time filen))
+		  (glob (conc *toppath* "/db/*.db")))))
+
 (define (dashboard:run-update x)
-  (let* ((modtime         (file-modification-time *db-file-path*))
+  (let* ((modtime         (dashboard:get-youngest-run-db-mod-time)) ;; (file-modification-time *db-file-path*))
 	 (monitor-modtime (file-modification-time *monitor-db-path*))
 	 (run-update-time (current-seconds))
 	 (recalc          (dashboard:recalc modtime *please-update-buttons* *last-db-update-time*)))
     (if (and (eq? *current-tab-number* 0)
 	     (> monitor-modtime *last-monitor-update-time*))
@@ -1491,12 +1496,12 @@
   (let ((runid (string->number (args:get-arg "-run"))))
     (if runid
 	(begin
 	  (lambda (x)
 	    (on-exit (lambda ()
-		       (if *db* (db:close-all *db*))))
-	    (examine-run *db* runid)))
+		       (if *dbstruct-local* (db:close-all *dbstruct-local*))))
+	    (examine-run *dbstruct-local* runid)))
 	(begin
 	  (print "ERROR: runid is not a number " (args:get-arg "-run"))
 	  (exit 1)))))
  ((args:get-arg "-test") ;; run-id,test-id
   (let* ((dat     (map string->number (string-split (args:get-arg "-test") ",")))
@@ -1508,13 +1513,13 @@
 	(examine-test run-id test-id)
 	(begin
 	  (debug:print 3 "INFO: tried to open test with invalid run-id,test-id. " (args:get-arg "-test"))
 	  (exit 1)))))
  ((args:get-arg "-guimonitor")
-  (gui-monitor *db*))
+  (gui-monitor *dbstruct-local*))
  (else
-  (set! uidat (make-dashboard-buttons *db* *num-runs* *num-tests* *dbkeys*))
+  (set! uidat (make-dashboard-buttons *dbstruct-local* *num-runs* *num-tests* *dbkeys*))
   (iup:callback-set! *tim*
 		     "ACTION_CB"
 		     (lambda (x)
 		       (let ((update-is-running #f))
 			 (mutex-lock! *update-mutex*)
@@ -1529,6 +1534,6 @@
 			     (set! *update-is-running* #f)
 			     (mutex-unlock! *update-mutex*))))
 		       1))))
 
 (iup:main-loop)
-(db:close-all *db*)
+(db:close-all *dbstruct-local*)