@@ -1799,10 +1799,15 @@
 	   (lambda (db)
 	     (sqlite3:execute db "UPDATE tests SET run_duration=? WHERE id=?;" alt-run-duration test-id)
 	     #t)))
 	#f))) ;; #f = we did NOT adjust the time
 	      
+;;  select end_time-now from
+;;      (select testname,item_path,event_time+run_duration as
+;;                          end_time,strftime('%s','now') as now from tests where state in
+;;      ('RUNNING','REMOTEHOSTSTART','LAUNCHED'));
+
 (define (db:find-and-mark-incomplete dbstruct run-id ovr-deadtime)
   (let* ((incompleted '())
 	 (oldlaunched '())
 	 (toplevels   '())
           ;; The default running-deadtime is 720 seconds = 12 minutes.
@@ -3235,21 +3240,19 @@
 				       test-id))))))
   (mt:process-triggers dbstruct run-id test-id newstate newstatus))
 
 ;; NEW BEHAVIOR: Count tests running in all runs!
 ;;
-(define (db:get-count-tests-running dbstruct run-id fastmode)
-  (let* ((qry (if fastmode
-		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '') LIMIT 1;"
-		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '');")))
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (db)
-     (let* ((stmth (db:get-cache-stmth dbstruct  db qry)))
-       (sqlite3:first-result stmth))))))
+(define (db:get-count-tests-running dbstruct run-id)
+  (let* ((qry  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '');"))
+    (db:with-db
+     dbstruct
+     run-id
+     #f
+     (lambda (db)
+       (let* ((stmth (db:get-cache-stmth dbstruct db qry)))
+	 (sqlite3:first-result stmth))))))
 
 ;; NEW BEHAVIOR: Count tests running in only one run!
 ;;
 (define (db:get-count-tests-actually-running dbstruct run-id)
   (db:with-db
@@ -3265,21 +3268,23 @@
       run-id)))) ;; NOT IN (SELECT id FROM runs WHERE state='deleted');")
 
 ;; NEW BEHAVIOR: Look only at single run with run-id
 ;; 
 ;; (define (db:get-running-stats dbstruct run-id)
-(define (db:get-count-tests-running-for-run-id dbstruct run-id fastmode)
-  (let* ((qry (if fastmode
-		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? LIMIT 1;"
-		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;")))
+(define (db:get-count-tests-running-for-run-id dbstruct run-id)
+  (let* ((qry "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;"))
     (db:with-db
      dbstruct
      run-id
      #f
      (lambda (db)
        (let* ((stmth (db:get-cache-stmth dbstruct db qry)))
-	 (sqlite3:first-result stmth run-id))))))
+	 (sqlite3:fold-row
+	  (lambda (res val) val)
+	  0 stmth run-id))))))
+
+;;	 (sqlite3:first-result stmth run-id))))))
 
 ;; For a given testname how many items are running? Used to determine
 ;; probability for regenerating html
 ;;
 (define (db:get-count-tests-running-for-testname dbstruct run-id testname)
@@ -3288,23 +3293,23 @@
    run-id
    #f
    (lambda (db)
      (let* ((stmt "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '') AND testname=?;")
 	    (stmth (db:get-cache-stmth dbstruct db stmt)))
-       (sqlite3:first-result
-	stmth run-id testname)))))
+       (sqlite3:fold-row
+	(lambda (res val) val) 0 stmth run-id testname)))))
 
 (define (db:get-not-completed-cnt dbstruct run-id)
-(db:with-db
+  (db:with-db
    dbstruct
    run-id
    #f
    (lambda (db)
-      ;(print "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=" run-id)  
-     (sqlite3:first-result
-      db
-      "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=?;" run-id))))
+     (let* ((stmt "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=?;"))
+       (sqlite3:fold-row
+	(lambda (res val) val)
+	0 (db:get-cache-stmth dbstruct db stmt) run-id)))))
 
 (define (db:get-count-tests-running-in-jobgroup dbstruct run-id jobgroup)
   (if (not jobgroup)
       0 ;; 
       (let ((testnames '()))