Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -235,10 +235,68 @@
 
 (define (http-transport:inc-requests-and-prep-to-close-all-connections)
   (mutex-lock! *http-mutex*)
   (set! *http-requests-in-progress* (+ 1 *http-requests-in-progress*)))
 
+(module httpclientmod
+*
+
+(import scheme
+	http-client
+	chicken
+	srfi-18
+	extras
+	)
+
+(defstruct srr ;; send-receive-rec
+  (res #f)
+  (success #f))
+
+(define (srr-send-receive srrobj db:string->obj db:obj->string *http-mutex* debug:debug-mode debug:print debug:print-info *default-log-port* remote-conndat-set!)
+  (mutex-lock! *http-mutex*)
+  ;; (condition-case (with-input-from-request "http://localhost"; #f read-lines)
+  ;;					       ((exn http client-error) e (print e)))
+  (set! res (vector                ;;; DON'T FORGET - THIS IS THE CLIENT SIDE! NOTE: consider moving this to client.scm since we are only supporting http transport at this time.
+	     success
+	     (db:string->obj 
+	      (handle-exceptions
+		  exn
+		(let ((call-chain (get-call-chain))
+		      (msg        ((condition-property-accessor 'exn 'message) exn)))
+		  (set! success #f)
+                  (if (debug:debug-mode 3)
+                      (debug:print-info 0 *default-log-port* "couldn't talk to server, trying again ...")
+                      (begin
+                        (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
+                        (debug:print 0 *default-log-port* " message: " msg ", exn=" exn)
+                        (debug:print 0 *default-log-port* " cmd: " cmd " params: " params " key:" (or server-id "thekey"))
+                        (debug:print 0 *default-log-port* " call-chain: " call-chain)))
+                  (if runremote
+		      (remote-conndat-set! runremote #f))
+		  ;; Killing associated server to allow clean retry.")
+		  ;; (tasks:kill-server-run-id run-id)  ;; better to kill the server in the logic that called this routine?
+		  (mutex-unlock! *http-mutex*)
+					     ;;; (signal (make-composite-condition
+					     ;;;          (make-property-condition 'commfail 'message "failed to connect to server")))
+					     ;;; "communications failed"
+		  (db:obj->string #f))
+		(with-input-from-request ;; was dat
+		 fullurl 
+		 (list (cons 'key (or server-id "thekey"))
+		       (cons 'cmd cmd)
+		       (cons 'params sparams))
+		 read-string))
+	      transport: 'http)
+             0)) ;; added this speculatively
+  ;; Shouldn't this be a call to the managed call-all-connections stuff above?
+  (close-all-connections!)
+  (mutex-unlock! *http-mutex*)
+  )
+
+) ;; module end
+(import httpclientmod)
+
 ;; Send "cmd" with json payload "params" to serverdat and receive result
 ;;
 (define (http-transport:client-api-send-receive run-id serverdat cmd params #!key (numretries 3)(area-dat #f))
   (let* ((fullurl    (if (vector? serverdat)
 			 (http-transport:server-dat-get-api-req serverdat)
@@ -263,50 +321,11 @@
        (retry-request? (lambda (request)
 			 #f))
        ;; send the data and get the response
        ;; extract the needed info from the http data and 
        ;; process and return it.
-       (let* ((send-recieve (lambda ()
-			      (mutex-lock! *http-mutex*)
-			      ;; (condition-case (with-input-from-request "http://localhost"; #f read-lines)
-			      ;;					       ((exn http client-error) e (print e)))
-			      (set! res (vector                ;;; DON'T FORGET - THIS IS THE CLIENT SIDE! NOTE: consider moving this to client.scm since we are only supporting http transport at this time.
-					 success
-					 (db:string->obj 
-					  (handle-exceptions
-					      exn
-					      (let ((call-chain (get-call-chain))
-						    (msg        ((condition-property-accessor 'exn 'message) exn)))
-						(set! success #f)
-                                                (if (debug:debug-mode 3)
-                                                    (debug:print-info 0 *default-log-port* "couldn't talk to server, trying again ...")
-                                                    (begin
-                                                      (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
-                                                      (debug:print 0 *default-log-port* " message: " msg ", exn=" exn)
-                                                      (debug:print 0 *default-log-port* " cmd: " cmd " params: " params " key:" (or server-id "thekey"))
-                                                      (debug:print 0 *default-log-port* " call-chain: " call-chain)))
-                                                (if runremote
-						    (remote-conndat-set! runremote #f))
-						;; Killing associated server to allow clean retry.")
-						;; (tasks:kill-server-run-id run-id)  ;; better to kill the server in the logic that called this routine?
-						(mutex-unlock! *http-mutex*)
-					     ;;; (signal (make-composite-condition
-					     ;;;          (make-property-condition 'commfail 'message "failed to connect to server")))
-					     ;;; "communications failed"
-						(db:obj->string #f))
-					    (with-input-from-request ;; was dat
-					     fullurl 
-					     (list (cons 'key (or server-id "thekey"))
-						   (cons 'cmd cmd)
-						   (cons 'params sparams))
-					     read-string))
-					  transport: 'http)
-                                         0)) ;; added this speculatively
-			      ;; Shouldn't this be a call to the managed call-all-connections stuff above?
-			      (close-all-connections!)
-			      (mutex-unlock! *http-mutex*)
-			      ))
+       (let* ((send-recieve (srr-send-receive srrobj db:string->obj db:obj->string *http-mutex* debug:debug-mode debug:print debug:print-info *default-log-port* remote-conndat-set!))
 	      (time-out     (lambda ()
 			      (thread-sleep! 45)
 			      (debug:print 0 *default-log-port* "WARNING: send-receive took more than 45 seconds!!")
 			      #f))
 	      (th1 (make-thread send-recieve "with-input-from-request"))