Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -27,10 +27,11 @@
 (import canvas-draw-iup)
 (use ducttape-lib)
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors
      matchable) ;; defstruct
 (import (prefix sqlite3 sqlite3:))
+
 
 (declare (uses common))
 (declare (uses margs))
 (declare (uses keys))
 (declare (uses items))
@@ -72,10 +73,13 @@
 ;; (declare (uses dbmod.import))
 
 (declare (uses servermod))
 (import servermod)
 
+;; This is the new runs view
+(include "dashboard-new-runs-view.scm")
+
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
 (include "megatest-version.scm")
@@ -194,10 +198,12 @@
 ;;       (debug:print-info 0 *default-log-port* "Forcing db-cache mode due to read-only access to megatest.db")
 ;;       (hash-table-set! args:arg-hash "-use-db-cache" #t)));;;)
 ;;)
 
 ;; data common to all tabs in dboard:commondat struct moved to dcommonmod
+  ;; data from sql db
+(keys       (rmt:get-keys))         ;; to be removed when targets handling is r
 
 ;; RA => returns the tabdat stored at hashkey passed in commondat-tabdats table (e.g. 0 gives summary)
 ;;
 (define (dboard:common-get-tabdat commondat #!key (tab-num #f))
   (let* ((tnum (or tab-num
@@ -286,90 +292,10 @@
   (make-dboard:runsdat
    runs-index: (make-hash-table)
    tests-index: (make-hash-table)
    matrix-dat: (make-sparse-array)))
 
-;; for the new runs view lets build up a few new record types and then consolidate later
-;;
-;; this is a two level deep pipeline for the incoming data:
-;;   sql query data ==> filters ==> data for display
-;;
-(defstruct dboard:rdat
-  ;; view related items
-  (runnum    0) ;; which column we are processing, index into runsbynum, we sweep across all these runs then start over
-  (leftcol   0) ;; number of the leftmost visible column
-  (toprow    0) ;; topmost visible row
-  (numcols  24) ;; number of columns visible
-  (numrows  20) ;; number of rows visible
-  
-  ;; data from sql db
-  (keys       (rmt:get-keys))         ;; to be removed when targets handling is refactored
-  (runs       (make-sparse-vector))   ;; id => runrec
-  (runsbynum  (make-vector 100 #f))   ;; vector num => runrec 
-  (targ-runid (make-hash-table))      ;; area/target/runname => run-id  ;; not sure this will be needed
-  (tests      (make-hash-table))      ;; test[/itempath] => list of test rec
-
-  ;; run sql filters 
-  (targ-sql-filt        "%")
-  (runname-sql-filt     "%")
-  (run-state-sql-filt   "%")
-  (run-status-sql-filt  "%")
-
-  ;; test sql filter
-  (testname-sql-filt    "%")
-  (itempath-sql-filt    "%")
-  (test-state-sql-filt  "%")
-  (test-status-sql-filt "%")
-
-  ;; other sql related fields
-  (last-updates (make-sparse-vector 0))  ;; run-id -> timestamp of the last update from sql db, set to zero on any field changes
-
-  ;; filtered data
-  (cols  (make-sparse-vector))   ;; columnnum => run-id
-  (tests (make-hash-table))      ;; test[/itempath] => (vector columnnum => test rec)
-
-  ;; various
-  (prev-run-ids  '())            ;; push previously looked at runs on this
-  (view-changed #f)
-
-  ;; widgets
-  (runs-tree #f)                 ;; 
-  )
-
-(define (dboard:rdat-push-run-id rdat run-id)
-  (dboard:rdat-prev-run-ids-set! rdat (cons run-id (dboard:rdat-prev-run-ids rdat))))
-
-(defstruct dboard:runrec
-  id
-  target  ;; a/b/c...
-  tdef    ;; for future use
-  )
-     
-(defstruct dboard:testrec
-  id
-  runid
-  testname  ;; test[/itempath]
-  state
-  status
-  start-time
-  duration
-  )
-
-
-(define (dboard:rundat-make-init #!key (run #f)(key-vals #f)(tests #f));; -100 is before time began
-  (make-dboard:rundat 
-   run: run
-   tests: (or tests (make-hash-table))
-   key-vals: key-vals 
-   )) 
-
-(defstruct dboard:testdat
-  id       ;; testid
-  state    ;; test state
-  status   ;; test status
-  )
-
 ;; default is to NOT set the cell if the column and row names are not pre-existing
 ;;
 (define (dboard:runsdat-set-test-cell dat target runname testname itempath test-id state status #!key (force-set #f))
   (let* ((col-num  (dcommon:runsdat-get-col-num dat target runname force-set))
 	 (row-num  (dcommon:runsdat-get-row-num dat testname itempath force-set)))
@@ -1661,21 +1587,10 @@
 ;; R U N
 ;;======================================================================
 ;;
 ;; display and manage a single run at a time
 
-(define (tree-path->run-id tabdat path)
-  (if (not (null? path))
-      (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) path #f)
-      #f))
-
-(define (new-tree-path->run-id rdat path)
-  (if (not (null? path))
-      (hash-table-ref/default(dboard:rdat-targ-runid rdat) path #f)
-       ;; 
-      #f))
-
 ;; (define (dboard:get-tests-dat tabdat run-id last-update)
 ;;   (let* ((access-mode     (dboard:tabdat-access-mode tabdat))
 ;;          (tdat (if run-id (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run
 ;;                                              run-id 
 ;; 					     (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) "test-name" "%/%")
@@ -2443,14 +2358,10 @@
 ;; simple-run-status-set!            procedure (x3814 val3815)
 ;; simple-run-target                 procedure (x3786)
 ;; simple-run-target-set!            procedure (x3782 val3783)
 ;; simple-run?                       procedure (x3780)
 
-
-;; This is the new runs view
-(include "dashboard-new-runs-view.scm")
-
 (define (make-dashboard-buttons commondat) ;;  runs-sum-dat new-view-dat)
   (let* ((stats-dat       (dboard:tabdat-make-data))
 	 (runs-dat        (dboard:tabdat-make-data))
 	 (runs2-dat       (make-dboard:rdat)) ;; (dboard:tabdat-make-data))
 	 (onerun-dat      (dboard:tabdat-make-data)) ;; name for run-summary structure 

Index: dcommonmod.scm
==================================================================
--- dcommonmod.scm
+++ dcommonmod.scm
@@ -23,21 +23,245 @@
 (declare (uses configfmod))
 
 (module dcommonmod
 	*
 	
-(import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:)
-	posix typed-records srfi-18
-	srfi-69)
+(import scheme chicken data-structures extras ports)
+(use
+ (prefix iup iup:)
+ canvas-draw
+ (prefix sqlite3 sqlite3:)
+ posix
+ typed-records
+ srfi-18
+ srfi-69
+ matchable
+ sparse-vectors
+ srfi-1
+ regex
+ srfi-13
+ )
+(import canvas-draw-iup)
 
 (import commonmod)
 (import configfmod)
+
+(include "common_records.scm")
+
+;;======================================================================
+;; T R E E   S T U F F 
+;;======================================================================
+
+;; path is a list of nodes, each the child of the previous
+;; this routine returns the id so another node can be added
+;; either as a leaf or as a branch
+;;
+;; BUG: This needs a stop sensor for when a branch is exhausted
+;;
+(define (tree:find-node obj path)
+  ;; start at the base of the tree
+  (if (null? path)
+      #f ;; or 0 ????
+      (let loop ((hed      (car path))
+		 (tal      (cdr path))
+		 (depth    0)
+		 (nodenum  0))
+	;; nodes in iup tree are 100% sequential so iterate over nodenum
+	(if (iup:attribute obj (conc "DEPTH" nodenum)) ;; end when no more nodes
+	    (let ((node-depth (string->number (iup:attribute obj (conc "DEPTH" nodenum))))
+		  (node-title (iup:attribute obj (conc "TITLE" nodenum))))
+	      (if (and (equal? depth node-depth)
+		       (equal? hed   node-title)) ;; yep, this is the one!
+		  (if (null? tal) ;; end of the line
+		      nodenum
+		      (loop (car tal)(cdr tal)(+ depth 1)(+ 1 nodenum)))
+		  ;; this is the case where we found part of the hierarchy but not 
+		  ;; all of it, i.e. the node-depth went from deep to less deep
+		  (if (> depth node-depth) ;; (+ 1 node-depth))
+		      #f
+		      (loop hed tal depth (+ nodenum 1)))))
+	    #f))))
+
+;; top is the top node name zeroeth node VALUE=0
+(define (tree:add-node obj top nodelst #!key (userdata #f))
+  (let ((curr-top (iup:attribute obj "TITLE0")))
+    (if (or (not (string? curr-top))
+	    (string-null? curr-top)
+	    (string-match "^\\s*$" curr-top))
+          (iup:attribute-set! obj "ADDBRANCH0" top))
+
+
+    
+    (cond
+     ((not (equal? top (iup:attribute obj "TITLE0")))
+      (print "ERROR: top name " top " doesn't match " (iup:attribute obj "TITLE0")))
+     ((null? nodelst))
+     (else
+      (let loop ((hed      (car nodelst))
+		 (tal      (cdr nodelst))
+		 (depth    1)
+		 (pathl    (list top)))
+	;; Because the tree dialog changes node numbers when
+	;; nodes are added or removed we must look up nodes
+	;; each and every time. 0 is the top node so default
+	;; to that.
+	(let* ((newpath    (append pathl (list hed)))
+	       (parentnode (tree:find-node obj pathl))
+	       (nodenum    (tree:find-node obj newpath)))
+	  ;; Add the branch under lastnode if not found
+	  (if (not nodenum)
+	      (begin
+		(iup:attribute-set! obj (conc "ADDBRANCH" parentnode) hed)
+		;; ERROR? ADDING DATA TO PARENT, DONT WE WANT IT ON CREATED NODE?
+		(if userdata
+		    (iup:attribute-set! obj (conc "USERDATA"   parentnode) userdata))
+		(if (null? tal)
+		    #t
+		    ;; reset to top
+		    (loop (car nodelst)(cdr nodelst) 1 (list top)))) 
+	      (if (null? tal) ;; if null here then this path has already been added
+		  #t
+		  (loop (car tal)(cdr tal)(+ depth 1) newpath)))))))))
+
+(define (tree:node->path obj nodenum)
+  (let loop ((currnode 0)
+	     (path     '()))
+    (let* ((node-depth (string->number (iup:attribute obj (conc "DEPTH" currnode))))
+	   (node-title (iup:attribute obj (conc "TITLE" currnode)))
+	   (trimpath   (if (and (not (null? path))
+				(> (length path) node-depth))
+			   (take path node-depth)
+			   path))
+	   (newpath    (append trimpath (list node-title))))
+      (if (>= currnode nodenum)
+	  newpath
+	  (loop (+ currnode 1)
+		newpath)))))
+
+(define (tree:delete-node obj top node-path) ;; node-path is a list of strings
+  (let ((id  (tree:find-node obj (cons top node-path))))
+    (print "Found node to remove " id " for path " top " " node-path)
+    (iup:attribute-set! obj (conc "DELNODE" id) "SELECTED")))
+	
+#|
+
+  (let* ((tb      (iup:treebox
+                   #:value 0
+                   #:name "Runs"
+                   #:expand "YES"
+                   #:addexpanded "NO"
+                   #:selection-cb
+                   (lambda (obj id state)
+                     ;; (print "obj: " obj ", id: " id ", state: " state)
+                     (let* ((run-path (tree:node->path obj id))
+                            (run-id   (tree-path->run-id (cdr run-path))))
+                       (if run-id
+                           (begin
+                             (dboard:data-curr-run-id-set! data run-id)
+                             (dashboard:update-run-summary-tab)))
+                       ;; (print "path: " (tree:node->path obj id) " run-id: " run-id)
+                       ))))
+|#
+
+(define (tree-path->run-id tabdat path)
+  (if (not (null? path))
+      (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) path #f)
+      #f))
+
+(define (new-tree-path->run-id rdat path)
+  (if (not (null? path))
+      (hash-table-ref/default(dboard:rdat-targ-runid rdat) path #f)
+       ;; 
+      #f))
+
 
 ;;======================================================================
 ;; COMMONDAT
 ;;======================================================================
+
+;; for the new runs view lets build up a few new record types and then consolidate later
+;;
+;; this is a two level deep pipeline for the incoming data:
+;;   sql query data ==> filters ==> data for display
+;;
+(defstruct dboard:rdat
+  ;; view related items
+  (runnum    0) ;; which column we are processing, index into runsbynum, we sweep across all these runs then start over
+  (leftcol   0) ;; number of the leftmost visible column
+  (toprow    0) ;; topmost visible row
+  (numcols  24) ;; number of columns visible
+  (numrows  20) ;; number of rows visible
+  
+efactored
+  (runs       (make-sparse-vector))   ;; id => runrec
+  (runsbynum  (make-vector 100 #f))   ;; vector num => runrec 
+  (targ-runid (make-hash-table))      ;; area/target/runname => run-id  ;; not sure this will be needed
+  (tests      (make-hash-table))      ;; test[/itempath] => list of test rec
+
+  ;; run sql filters 
+  (targ-sql-filt        "%")
+  (runname-sql-filt     "%")
+  (run-state-sql-filt   "%")
+  (run-status-sql-filt  "%")
+
+  ;; test sql filter
+  (testname-sql-filt    "%")
+  (itempath-sql-filt    "%")
+  (test-state-sql-filt  "%")
+  (test-status-sql-filt "%")
+
+  ;; other sql related fields
+  (last-updates (make-sparse-vector 0))  ;; run-id -> timestamp of the last update from sql db, set to zero on any field changes
+
+  ;; filtered data
+  (cols  (make-sparse-vector))   ;; columnnum => run-id
+  (tests (make-hash-table))      ;; test[/itempath] => (vector columnnum => test rec)
+
+  ;; various
+  (prev-run-ids  '())            ;; push previously looked at runs on this
+  (view-changed #f)
+
+  ;; widgets
+  (runs-tree #f)                 ;; 
+  )
+
+(define (dboard:rdat-push-run-id rdat run-id)
+  (dboard:rdat-prev-run-ids-set! rdat (cons run-id (dboard:rdat-prev-run-ids rdat))))
+
+(defstruct dboard:runrec
+  id
+  target  ;; a/b/c...
+  tdef    ;; for future use
+  )
+     
+(defstruct dboard:testrec
+  id
+  runid
+  testname  ;; test[/itempath]
+  state
+  status
+  start-time
+  duration
+  )
+
+
+(define (dboard:rundat-make-init #!key (run #f)(key-vals #f)(tests #f));; -100 is before time began
+  (make-dboard:rundat 
+   run: run
+   tests: (or tests (make-hash-table))
+   key-vals: key-vals 
+   )) 
+
+(defstruct dboard:testdat
+  id       ;; testid
+  state    ;; test state
+  status   ;; test status
+  )
+
+
+
+
 
 ;; data common to all tabs goes here
 ;;
 (defstruct dboard:commondat
   ((curr-tab-num 0) : number)

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -46,119 +46,5 @@
 (include "megatest-version.scm")
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 
-;;======================================================================
-;; T R E E   S T U F F 
-;;======================================================================
-
-;; path is a list of nodes, each the child of the previous
-;; this routine returns the id so another node can be added
-;; either as a leaf or as a branch
-;;
-;; BUG: This needs a stop sensor for when a branch is exhausted
-;;
-(define (tree:find-node obj path)
-  ;; start at the base of the tree
-  (if (null? path)
-      #f ;; or 0 ????
-      (let loop ((hed      (car path))
-		 (tal      (cdr path))
-		 (depth    0)
-		 (nodenum  0))
-	;; nodes in iup tree are 100% sequential so iterate over nodenum
-	(if (iup:attribute obj (conc "DEPTH" nodenum)) ;; end when no more nodes
-	    (let ((node-depth (string->number (iup:attribute obj (conc "DEPTH" nodenum))))
-		  (node-title (iup:attribute obj (conc "TITLE" nodenum))))
-	      (if (and (equal? depth node-depth)
-		       (equal? hed   node-title)) ;; yep, this is the one!
-		  (if (null? tal) ;; end of the line
-		      nodenum
-		      (loop (car tal)(cdr tal)(+ depth 1)(+ 1 nodenum)))
-		  ;; this is the case where we found part of the hierarchy but not 
-		  ;; all of it, i.e. the node-depth went from deep to less deep
-		  (if (> depth node-depth) ;; (+ 1 node-depth))
-		      #f
-		      (loop hed tal depth (+ nodenum 1)))))
-	    #f))))
-
-;; top is the top node name zeroeth node VALUE=0
-(define (tree:add-node obj top nodelst #!key (userdata #f))
-  (let ((curr-top (iup:attribute obj "TITLE0")))
-    (if (or (not (string? curr-top))
-	    (string-null? curr-top)
-	    (string-match "^\\s*$" curr-top))
-          (iup:attribute-set! obj "ADDBRANCH0" top))
-
-
-    
-    (cond
-     ((not (equal? top (iup:attribute obj "TITLE0")))
-      (print "ERROR: top name " top " doesn't match " (iup:attribute obj "TITLE0")))
-     ((null? nodelst))
-     (else
-      (let loop ((hed      (car nodelst))
-		 (tal      (cdr nodelst))
-		 (depth    1)
-		 (pathl    (list top)))
-	;; Because the tree dialog changes node numbers when
-	;; nodes are added or removed we must look up nodes
-	;; each and every time. 0 is the top node so default
-	;; to that.
-	(let* ((newpath    (append pathl (list hed)))
-	       (parentnode (tree:find-node obj pathl))
-	       (nodenum    (tree:find-node obj newpath)))
-	  ;; Add the branch under lastnode if not found
-	  (if (not nodenum)
-	      (begin
-		(iup:attribute-set! obj (conc "ADDBRANCH" parentnode) hed)
-		;; ERROR? ADDING DATA TO PARENT, DONT WE WANT IT ON CREATED NODE?
-		(if userdata
-		    (iup:attribute-set! obj (conc "USERDATA"   parentnode) userdata))
-		(if (null? tal)
-		    #t
-		    ;; reset to top
-		    (loop (car nodelst)(cdr nodelst) 1 (list top)))) 
-	      (if (null? tal) ;; if null here then this path has already been added
-		  #t
-		  (loop (car tal)(cdr tal)(+ depth 1) newpath)))))))))
-
-(define (tree:node->path obj nodenum)
-  (let loop ((currnode 0)
-	     (path     '()))
-    (let* ((node-depth (string->number (iup:attribute obj (conc "DEPTH" currnode))))
-	   (node-title (iup:attribute obj (conc "TITLE" currnode)))
-	   (trimpath   (if (and (not (null? path))
-				(> (length path) node-depth))
-			   (take path node-depth)
-			   path))
-	   (newpath    (append trimpath (list node-title))))
-      (if (>= currnode nodenum)
-	  newpath
-	  (loop (+ currnode 1)
-		newpath)))))
-
-(define (tree:delete-node obj top node-path) ;; node-path is a list of strings
-  (let ((id  (tree:find-node obj (cons top node-path))))
-    (print "Found node to remove " id " for path " top " " node-path)
-    (iup:attribute-set! obj (conc "DELNODE" id) "SELECTED")))
-	
-#|
-
-  (let* ((tb      (iup:treebox
-                   #:value 0
-                   #:name "Runs"
-                   #:expand "YES"
-                   #:addexpanded "NO"
-                   #:selection-cb
-                   (lambda (obj id state)
-                     ;; (print "obj: " obj ", id: " id ", state: " state)
-                     (let* ((run-path (tree:node->path obj id))
-                            (run-id   (tree-path->run-id (cdr run-path))))
-                       (if run-id
-                           (begin
-                             (dboard:data-curr-run-id-set! data run-id)
-                             (dashboard:update-run-summary-tab)))
-                       ;; (print "path: " (tree:node->path obj id) " run-id: " run-id)
-                       ))))
-|#