@@ -22,10 +22,13 @@
 
 (declare (unit rmt))
 (declare (uses api))
 (declare (uses http-transport))
 (include "common_records.scm")
+(declare (uses rmtmod))
+
+(import rmtmod)
 
 ;;
 ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
 ;;
 
@@ -238,17 +241,17 @@
      ;;DOT CASE11 [label="send_receive"];
      ;;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 (extras-case-11 *default-log-port* runremote cmd params attemptnum)))))
+     (else (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)))))
     ;;DOT }
 
 ;; bunch of small functions factored out of send-receive to make debug easier
 ;;
 
-(define (extras-case-11 *default-log-port* runremote cmd params attemptnum)
+(define (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)
   ;; (mutex-unlock! *rmt-mutex*)
   (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9")
   ;; (mutex-lock! *rmt-mutex*)
   (let* ((conninfo (remote-conndat runremote))
 	 (dat      (case (remote-transport runremote)
@@ -278,59 +281,14 @@
     (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
-	(extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res)
+	(extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
 	(extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
 	)))
 
-(define (extras-readonly-mode rmt-mutex log-port cmd params)
-  (mutex-unlock! rmt-mutex)
-  (debug:print-info 12 log-port "rmt:send-receive, case 3")
-  (debug:print 0 log-port "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
-  #f)
-
-(define (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
-  (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-  (mutex-lock! *rmt-mutex*)
-  (remote-conndat-set!    runremote #f)
-  (http-transport:close-connections area-dat: runremote)
-  (remote-server-url-set! runremote #f)
-  (mutex-unlock! *rmt-mutex*)
-  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
-  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
-  
-(define (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res)
-  (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
-	(mutex-unlock! *rmt-mutex*)
-	(thread-sleep! wait-delay)
-	(rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
-      res)) ;; All good, return res
-
 ;; (define (rmt:update-db-stats run-id rawcmd params duration)
 ;;   (mutex-lock! *db-stats-mutex*)
 ;;   (handle-exceptions
 ;;    exn
 ;;    (begin
@@ -982,5 +940,8 @@
 (define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
   (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
 
 (define (rmt:test-get-archive-block-info archive-block-id)
   (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))
+
+(set-functions rmt:send-receive remote-server-url-set! http-transport:close-connections
+	       remote-conndat-set! debug:print debug:print-info)