@@ -126,24 +126,25 @@
 
      ;; This block was for pre-emptively resetting the connection if there had been no communication for some time.
      ;; I don't think it adds any value. If the server is not there, just fail and start a new connection.
      ;; also, the expire-time calculation might not be correct. We want, time-since-last-server-access > (server:get-timeout)
      ;;
-     ;; ;;DOT CASE4 [label="reset\nconnection"];
-     ;; ;;DOT MUTEXLOCK -> CASE4 [label="have connection,\nlast_access > expire_time"]; {rank=same "case 4" CASE4}
-     ;; ;;DOT CASE4 -> "rmt:send-receive";
-     ;; ;; reset the connection if it has been unused too long
-     ;; ((and runremote
-     ;;       (remote-conndat runremote)
-     ;; 	   (let ((expire-time (+ (- start-time (remote-server-timeout runremote))(random 10)))) ;; Subtract or add the random value? Seems like it should be substract but Neither fixes the "WARNING: failure in with-input-from-request to #<request>.\n message: Server closed connection before sending response"
-     ;; 	     (< (http-transport:server-dat-get-last-access (remote-conndat runremote)) expire-time)))
-     ;;  (debug:print-info 0 *default-log-port* "Connection to " (remote-server-url runremote) " expired due to no accesses, forcing new connection.")
-     ;;  (http-transport:close-connections area-dat: runremote)
-     ;;  (remote-conndat-set! runremote #f) ;; invalidate the connection, thus forcing a new connection.
-     ;;  (mutex-unlock! *rmt-mutex*)
-     ;;  (rmt:send-receive cmd rid params attemptnum: attemptnum))
-
+     ;;DOT CASE4 [label="reset\nconnection"];
+     ;;DOT MUTEXLOCK -> CASE4 [label="have connection,\nlast_access > expire_time"]; {rank=same "case 4" CASE4}
+     ;;DOT CASE4 -> "rmt:send-receive";
+     ;; reset the connection if it has been unused too long
+     ((and runremote
+           (remote-conndat runremote)
+	   (> (current-seconds) ;; if it has been more than server-timeout seconds since last contact, close this connection and start a new on
+	      (+ (http-transport:server-dat-get-last-access (remote-conndat runremote))
+		 (remote-server-timeout runremote))))
+      (debug:print-info 0 *default-log-port* "Connection to " (remote-server-url runremote) " expired due to no accesses, forcing new connection.")
+      (http-transport:close-connections area-dat: runremote)
+      (remote-conndat-set! runremote #f) ;; invalidate the connection, thus forcing a new connection.
+      (mutex-unlock! *rmt-mutex*)
+      (rmt:send-receive cmd rid params attemptnum: attemptnum))
+     
      ;;DOT CASE5 [label="local\nread"];
      ;;DOT MUTEXLOCK -> CASE5 [label="server not required,\non homehost,\nread-only query"]; {rank=same "case 5" CASE5};
      ;;DOT CASE5 -> "rmt:open-qry-close-locally";
 
      ;; on homehost and this is a read
@@ -228,13 +229,13 @@
      ;;DOT MUTEXLOCK -> CASE11 [label="else"]; {rank=same "case 11" CASE11};
      ;;DOT CASE11 -> "rmt:send-receive" [label="call failed"];
      ;;DOT CASE11 -> "RESULT" [label="call succeeded"];
      ;; not on homehost, do server query
      (else
-      (mutex-unlock! *rmt-mutex*)
+      ;; (mutex-unlock! *rmt-mutex*)
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9")
-      (mutex-lock! *rmt-mutex*)
+      ;; (mutex-lock! *rmt-mutex*)
       (let* ((conninfo (remote-conndat runremote))
 	     (dat      (case (remote-transport runremote)
 			 ((http) (condition-case ;; handling here has caused a lot of problems. However it is needed to deal with attemtped communication to servers that have gone away
                                   (http-transport:client-api-send-receive 0 conninfo cmd params)
                                   ((commfail)(vector #f "communications fail"))
@@ -242,18 +243,26 @@
 			 (else
 			  (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " not supported")
 			  (exit))))
 	     (success  (if (vector? dat) (vector-ref dat 0) #f))
 	     (res      (if (vector? dat) (vector-ref dat 1) #f)))
-	(if (vector? conninfo)(http-transport:server-dat-update-last-access conninfo)) ;; refresh access time
+	(if (and (vector? conninfo) (< 5 (vector-length conninfo)))
+            (http-transport:server-dat-update-last-access conninfo) ;; refresh access time
+	    (begin
+              (debug:print 0 *default-log-port* "INFO: Should not get here! conninfo=" conninfo)
+              (set! conninfo #f)
+              (remote-conndat-set! *runremote* #f)
+              (http-transport:close-connections  area-dat: runremote)))
 	;; (mutex-unlock! *rmt-mutex*)
         (debug:print-info 13 *default-log-port* "rmt:send-receive, case  9. conninfo=" conninfo " dat=" dat " runremote = " runremote)
 	(mutex-unlock! *rmt-mutex*)
 	(if success ;; success only tells us that the transport was successful, have to examine the data to see if there was a detected issue at the other end
 	    (if (and (vector? res)
 		     (eq? (vector-length res) 2)
 		     (eq? (vector-ref res 1) 'overloaded)) ;; since we are looking at the data to carry the error we'll use a fairly obtuse combo to minimise the chances of some sort of collision.
+                ;; this is the case where the returned data is bad or the server is overloaded and we want
+                ;; to ease off the queries
 		(let ((wait-delay (+ attemptnum (* attemptnum 10))))
 		  (debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
 		  (mutex-lock! *rmt-mutex*)
 		  (http-transport:close-connections area-dat: runremote)
 		  (set! *runremote* #f) ;; force starting over
@@ -261,14 +270,16 @@
 		  (thread-sleep! wait-delay)
 		  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
 		res) ;; All good, return res
 	    (begin
 	      (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-	      (remote-conndat-set!    runremote #f)
+	      (mutex-lock! *rmt-mutex*)
+              (remote-conndat-set!    runremote #f)
 	      (http-transport:close-connections area-dat: runremote)
 	      (remote-server-url-set! runremote #f)
-	      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
+	      (mutex-unlock! *rmt-mutex*)
+              (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
 	      ;; (if (not (server:check-if-running *toppath*))
 	      ;; 	  (server:start-and-wait *toppath*))
 	      (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))))))))
 
     ;;DOT }
@@ -489,10 +500,14 @@
 (define (rmt:get-targets)
   (rmt:send-receive 'get-targets #f '()))
 
 (define (rmt:get-target run-id)
   (rmt:send-receive 'get-target run-id (list run-id)))
+
+(define (rmt:get-run-times runpatt targetpatt)
+  (rmt:send-receive 'get-run-times #f (list runpatt targetpatt ))) 
+
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================
 
@@ -540,10 +555,13 @@
 
 ;; get stuff via synchash 
 (define (rmt:synchash-get run-id proc synckey keynum params)
   (rmt:send-receive 'synchash-get run-id (list run-id proc synckey keynum params)))
 
+(define (rmt:get-tests-for-run-mindata run-id testpatt states status not-in)
+  (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-id testpatt states status not-in)))
+  
 ;; IDEA: Threadify these - they spend a lot of time waiting ...
 ;;
 (define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
   (let ((multi-run-mutex (make-mutex))
 	(run-id-list (if run-ids
@@ -667,10 +685,13 @@
   (rmt:send-receive 'top-test-set-per-pf-counts run-id (list run-id test-name)))
 
 (define (rmt:get-raw-run-stats run-id)
   (rmt:send-receive 'get-raw-run-stats run-id (list run-id)))
 
+(define (rmt:get-test-times runname target)
+  (rmt:send-receive 'get-test-times #f (list runname target ))) 
+
 ;;======================================================================
 ;;  R U N S
 ;;======================================================================
 
 (define (rmt:get-run-info run-id)
@@ -696,10 +717,13 @@
   (rmt:send-receive 'delete-old-deleted-test-records #f '()))
 
 (define (rmt:get-runs runpatt count offset keypatts)
   (rmt:send-receive 'get-runs #f (list runpatt count offset keypatts)))
 
+(define (rmt:simple-get-runs runpatt count offset target)
+  (rmt:send-receive 'simple-get-runs #f (list runpatt count offset target)))
+
 (define (rmt:get-all-run-ids)
   (rmt:send-receive 'get-all-run-ids #f '()))
 
 (define (rmt:get-prev-run-ids run-id)
   (rmt:send-receive 'get-prev-run-ids #f (list run-id)))
@@ -804,19 +828,24 @@
     (rmt:send-receive 'teststep-set-status! run-id (list run-id test-id teststep-name state-in status-in comment logfile))))
 
 (define (rmt:get-steps-for-test run-id test-id)
   (rmt:send-receive 'get-steps-for-test run-id (list run-id test-id)))
 
+(define (rmt:get-steps-info-by-id test-step-id)
+  (rmt:send-receive 'get-steps-info-by-id #f (list test-step-id)))
+
 ;;======================================================================
 ;;  T E S T   D A T A 
 ;;======================================================================
 
 (define (rmt:read-test-data run-id test-id categorypatt #!key (work-area #f)) 
   (rmt:send-receive 'read-test-data run-id (list run-id test-id categorypatt)))
 (define (rmt:read-test-data* run-id test-id categorypatt varpatt #!key (work-area #f)) 
   (rmt:send-receive 'read-test-data* run-id (list run-id test-id categorypatt varpatt)))
 
+(define (rmt:get-data-info-by-id test-data-id)
+   (rmt:send-receive 'get-data-info-by-id #f (list test-data-id)))
 
 (define (rmt:testmeta-add-record testname)
   (rmt:send-receive 'testmeta-add-record #f (list testname)))
 
 (define (rmt:testmeta-get-record testname)
@@ -858,10 +887,13 @@
   (rmt:send-receive 'no-sync-get/default #f `(,var ,default)))
 
 (define (rmt:no-sync-del! var)
   (rmt:send-receive 'no-sync-del! #f `(,var)))
 
+(define (rmt:no-sync-get-lock keyname)
+  (rmt:send-receive 'no-sync-get-lock #f `(,keyname)))
+
 ;;======================================================================
 ;; A R C H I V E S
 ;;======================================================================
 
 (define (rmt:archive-get-allocations  testname itempath dneeded)