@@ -6,12 +6,24 @@
 ;; 
 ;;  This program is distributed WITHOUT ANY WARRANTY; without even the
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
+(require-extension (srfi 18) extras tcp rpc)
+(import (prefix rpc rpc:))
+
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo)
+(import (prefix sqlite3 sqlite3:))
+
 (declare (unit server))
 
+(declare (uses common))
+(declare (uses db))
+
+(include "common_records.scm")
+(include "db_records.scm")
+
 ;; procstr is the name of the procedure to be called as a string
 (define (server:autoremote procstr params)
   (handle-exceptions
    exn
    (begin
@@ -19,23 +31,79 @@
      (apply (eval (string->symbol proc)) params))
    (if *runremote*
        (apply (eval (string->symbol (conc "remote:" procstr))) params)
        (eval (string->symbol procstr) params))))
 
-(define (server:start db)
+(define (server:start db hostn)
   (debug:print 0 "Attempting to start the server ...")
-  (let* ((rpc:listener (server:find-free-port-and-open (rpc:default-server-port)))
-	 (th1          (make-thread
-			(cute (rpc:make-server rpc:listener) "rpc:server")
-			'rpc:server)))
-    (db:set-var db "SERVER" (conc (get-host-name) ":" (rpc:default-server-port)))
+  (let* ((rpc:listener   (server:find-free-port-and-open (rpc:default-server-port)))
+	 (th1            (make-thread
+			  (cute (rpc:make-server rpc:listener) "rpc:server")
+			  'rpc:server))
+	 (hostname       (if (string=? "-" hostn)
+			     (get-host-name) 
+			     hostn))
+	 (ipaddrstr      (if (string=? "-" hostn)
+			     (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
+			     #f))
+	 (host:port      (conc (if ipaddrstr ipaddrstr hostname) ":" (rpc:default-server-port))))
+    (db:set-var db "SERVER" host:port)
     (rpc:publish-procedure! 
      'remote:run 
      (lambda (procstr . params)
        (server:autoremote procstr params)))
-    (set! *rpc:listener* rpc:listener*)
-    (thread-start! rpc:server)))
+
+    ;;======================================================================
+    ;; db specials here
+    ;;======================================================================
+    ;; ** set-tests-state-status
+    (rpc:publish-procedure!
+     'rdb:set-tests-state-status 
+     (lambda (run-id testnames currstate currstatus newstate newstatus)
+       (db:set-tests-state-status db run-id testnames currstate currstatus newstate newstatus)))
+
+    (rpc:publish-procedure!
+     'rdb:teststep-set-status!
+     (lambda (run-id test-name teststep-name state-in status-in item-path comment logfile)
+       (db:teststep-set-status! db run-id test-name teststep-name state-in status-in item-path comment logfile)))
+
+    (rpc:publish-procedure!
+     'rdb:test-update-meta-info
+     (lambda (run-id testname item-path minutes cpuload diskfree tmpfree)
+       (db:test-update-meta-info db run-id testname item-path minutes cpuload diskfree tmpfree)))
+     
+    (rpc:publish-procedure!
+     'rdb:test-set-state-status-by-run-id-testname
+     (lambda (run-id test-name item-path status state)
+       (db:test-set-state-status-by-run-id-testname db run-id test-name item-path status state)))
+
+    (rpc:publish-procedure!
+     'rdb:csv->test-data 
+     (lambda (test-id csvdata)
+       (db:csv->data db test-id csvdata)))
+
+    (rpc:publish-procedure!
+     'rdb:roll-up-pass-fail-counts
+     (lambda (run-id test-name item-path status)
+       (db:roll-up-pass-fail-counts db run-id test-name item-path status)))
+
+    (rpc:publish-procedure!
+     'rdb:test-set-comment 
+     (lambda (run-id test-name item-path comment)
+       (db:test-set-comment db run-id test-name item-path comment)))
+    
+    (rpc:publish-procedure!
+     'rpc:test-set-log!
+     (lambda (run-id test-name item-path logf)
+       (db:test-set-log! db run-id test-name item-path logf)))
+
+    (set! *rpc:listener* rpc:listener)
+    (on-exit (lambda ()
+	       (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER' and val=?;" host:port)
+	       (sqlite3:finalize! db)))
+    (thread-start! th1)
+    (thread-join! th1))) ;; rpc:server)))
 
 (define (server:find-free-port-and-open port)
   (handle-exceptions
    exn
    (begin
@@ -47,6 +115,10 @@
 (define (server:client-setup db)
   (let* ((hostinfo (db:get-var db "SERVER"))
 	 (hostdat  (if hostinfo (string-split hostinfo ":")))
 	 (host     (if hostinfo (car hostdat)))
 	 (port     (if (and hostinfo (> (length hostdat) 1))(cadr hostdat) #f)))
-    (set! *runremote* (vector host port))))
+    (if (and port
+	     (string->number port))
+	(debug:print 2 "INFO: Setting up to connect to host " host ":" port))
+    (set! *runremote* (if port (vector host (string->number port)) #f))))
+