@@ -41,21 +41,22 @@
   (let* ((run-id  (if rid rid 0))
 	 (connection-info (let ((cinfo (hash-table-ref/default *runremote* run-id #f)))
 			    (if cinfo
 				cinfo
 				(let loop ((numtries 100))
-				  (thread-sleep! 1)
 				  (let ((res (client:setup run-id)))
 				    (if res 
 					(hash-table-ref *runremote* run-id) ;; client:setup filled this in (hopefully)
 					(if (> numtries 0)
-					    (loop (- numtries 1))
+					    (begin
+					      (thread-sleep! 10)
+					      (loop (- numtries 1)))
 					    (begin
 					      (debug:print 0 "ERROR: 100 tries and no server, giving up")
 					      (exit 1)))))))))
 	 (jparams         (db:obj->string params))
-	 (res (http-transport:client-api-send-receive run-id connection-info cmd jparams)))
+	 (res     (http-transport:client-api-send-receive run-id connection-info cmd jparams)))
     (if res
 	(db:string->obj res) ;; (rmt:json-str->dat res)
 	(let ((new-connection-info (client:setup run-id)))
 	  (debug:print 0 "WARNING: Communication failed, trying call to http-transport:client-api-send-receive again.")
 	  (rmt:send-receive cmd run-id params)))))
@@ -83,10 +84,20 @@
 ;;======================================================================
 ;;
 ;; A C T U A L   A P I   C A L L S  
 ;;
 ;;======================================================================
+
+;;======================================================================
+;;  S E R V E R
+;;======================================================================
+
+(define (rmt:kill-server run-id)
+  (rmt:send-receive 'kill-server run-id (list run-id)))
+
+(define (rmt:start-server run-id)
+  (rmt:send-receive 'start-server 0 (list run-id)))
 
 ;;======================================================================
 ;;  M I S C
 ;;======================================================================
 
@@ -96,13 +107,10 @@
 ;; This login does no retries under the hood - it acts a bit like a ping.
 ;;
 (define (rmt:login-no-auto-client-setup connection-info run-id)
   (rmt:send-receive-no-auto-client-setup connection-info 'login run-id (list *toppath* megatest-version run-id *my-client-signature*)))
   
-(define (rmt:kill-server run-id)
-  (rmt:send-receive 'kill-server run-id (list run-id)))
-
 ;; hand off a call to one of the db:queries statements
 ;; added run-id to make looking up the correct db possible 
 ;;
 (define (rmt:general-call stmtname run-id . params)
   (rmt:send-receive 'general-call run-id (append (list stmtname run-id) params)))
@@ -120,12 +128,12 @@
 
 ;;======================================================================
 ;;  K E Y S 
 ;;======================================================================
 
-;; These should not require run-id but it is more consistent to have it. 
-;; run-id can theoretically be #f but how to handle that is not yet done.
+;; These require run-id because the values come from the run!
+;;
 (define (rmt:get-key-val-pairs run-id)
   (rmt:send-receive 'get-key-val-pairs run-id (list run-id)))
 
 (define (rmt:get-keys)
   (rmt:send-receive 'get-keys #f '()))
@@ -182,12 +190,12 @@
   (rmt:send-receive 'delete-test-records run-id (list run-id test-id)))
 
 (define (rmt:test-set-status-state run-id test-id status state msg)
   (rmt:send-receive 'test-set-status-state run-id (list run-id test-id status state msg)))
 
-(define (rmt:get-previous-test-run-record run-id test-name item-path)
-  (rmt:send-receive 'get-previous-test-run-record run-id (list run-id test-name item-path)))
+;; (define (rmt:get-previous-test-run-record run-id test-name item-path)
+;;   (rmt:send-receive 'get-previous-test-run-record run-id (list run-id test-name item-path)))
 
 (define (rmt:get-matching-previous-test-run-records run-id test-name item-path)
   (rmt:send-receive 'get-matching-previous-test-run-records run-id (list run-id test-name item-path)))
 
 (define (rmt:test-get-logfile-info run-id test-name)
@@ -200,17 +208,21 @@
   (rmt:send-receive 'get-testinfo-state-status run-id (list run-id test-id)))
 
 (define (rmt:test-set-log! run-id test-id logf)
   (if (string? logf)(rmt:general-call 'test-set-log run-id logf test-id)))
 
+(define (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)
+  (rmt:send-receive 'get-run-ids-matching-target #f (list keynames target res runname testpatt statepatt statuspatt)))
+
 ;; NOTE: This will open and access ALL run databases. 
 ;;
 (define (rmt:test-get-paths-matching-keynames-target-new keynames target res testpatt statepatt statuspatt runname)
-  (let ((run-ids (rmt:get-all-run-ids))) ;; (rmt:get-run-ids-matching keynames target res)))
-    (apply append (lambda (run-id)
-		    (rmt:send-receive 'test-get-paths-matching-keynames-target-new (list keynames target res testpatt statepatt statuspatt runname)))
-	   run-ids)))
+  (let ((run-ids (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)))
+    (apply append 
+	   (map (lambda (run-id)
+		  (rmt:send-receive 'test-get-paths-matching-keynames-target-new run-id (list run-id keynames target res testpatt statepatt statuspatt runname)))
+	   run-ids))))
 
 (define (rmt:get-run-ids-matching keynames target res)
   (rmt:send-receive #f 'get-run-ids-matching (list keynames target res)))
 
 (define (rmt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal))
@@ -260,18 +272,52 @@
   (rmt:send-receive 'get-runs #f (list runpatt count offset keypatts)))
 
 (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)))
+
 (define (rmt:lock/unlock-run run-id lock unlock user)
   (rmt:send-receive 'lock/unlock-run #f (list run-id lock unlock user)))
 
 (define (rmt:update-run-event_time run-id)
   (rmt:send-receive 'update-run-event_time #f (list run-id)))
 
 (define (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit)
   (rmt:send-receive 'get-runs-by-patt #f (list keys runnamepatt targpatt offset limit)))
+
+;;======================================================================
+;; M U L T I R U N   Q U E R I E S
+;;======================================================================
+
+;; get the previous record for when this test was run where all keys match but runname
+;; returns #f if no such test found, returns a single test record if found
+;; 
+;; Run this at the client end since we have to connect to multiple run-id dbs
+;;
+(define (rmt:get-previous-test-run-record run-id test-name item-path)
+  (let* ((keyvals (rmt:get-key-val-pairs run-id))
+	 (keys    (rmt:get-keys))
+	 (selstr  (string-intersperse  keys ","))
+	 (qrystr  (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND ")))
+    (if (not keyvals)
+	#f
+	(let ((prev-run-ids (rmt:get-prev-run-ids run-id)))
+	  ;; for each run starting with the most recent look to see if there is a matching test
+	  ;; if found then return that matching test record
+	  (debug:print 4 "selstr: " selstr ", qrystr: " qrystr ", keyvals: " keyvals ", previous run ids found: " prev-run-ids)
+	  (if (null? prev-run-ids) #f
+	      (let loop ((hed (car prev-run-ids))
+			 (tal (cdr prev-run-ids)))
+		(let ((results (rmt:get-tests-for-run hed (conc test-name "/" item-path) '() '() #f #f #f #f #f #f)))
+		  (debug:print 4 "Got tests for run-id " run-id ", test-name " test-name ", item-path " item-path ": " results)
+		  (if (and (null? results)
+			   (not (null? tal)))
+		      (loop (car tal)(cdr tal))
+		      (if (null? results) #f
+			  (car results))))))))))
 
 ;;======================================================================
 ;;  S T E P S
 ;;======================================================================