@@ -12,11 +12,12 @@
 ;;======================================================================
 ;; A hash of hashes that can be kept in sync by sending minial deltas
 ;;======================================================================
 
 (use format)
-(use srfi-1 srfi-69)
+(use srfi-1 srfi-69 sqlite3)
+(import (prefix sqlite3 sqlite3:))
 
 (declare (unit synchash))
 (declare (uses db))
 (declare (uses server))
 (include "db_records.scm")
@@ -62,11 +63,12 @@
 ;; (cdb:remote-run db:get-runs #f runnamepatt numruns *start-run-offset* keypatts)
 ;;
 ;; keynum => the field to use as the unique key (usually 0 but can be other field)
 ;;
 (define (synchash:client-get proc synckey keynum synchash . params)
-  (let* ((data   (apply cdb:remote-run synchash:server-get #f proc synckey keynum params))
+  (let* ((data   ;; (apply cdb:remote-run synchash:server-get #f proc synckey keynum params))
+	  (apply synchash:server-get #f proc synckey keynum params))
 	 (newdat (car data))
 	 (removs (cadr data))
 	 (myhash (hash-table-ref/default synchash synckey #f)))
     (if (not myhash)
 	(begin
@@ -87,13 +89,14 @@
     ;; data)) ;; return the changed and deleted list
     (list newdat removs))) ;; synchash))
 
 (define *synchashes* (make-hash-table))
 
-(define (synchash:server-get db proc synckey keynum . params)
+(define (synchash:server-get indb proc synckey keynum . params)
   ;; (debug:print-info 2 "synckey: " synckey ", keynum: " keynum ", params: " params)
-  (let* ((synchash  (hash-table-ref/default *synchashes* synckey #f))
+  (let* ((db        (if indb indb (db:open-megatest-db)))
+	 (synchash  (hash-table-ref/default *synchashes* synckey #f))
 	 (newdat    (apply (case proc
 			     ((db:get-runs)                   db:get-runs)
 			     ((db:get-tests-for-runs-mindata) db:get-tests-for-runs-mindata)
 			     ((db:get-test-info-by-ids)       db:get-test-info-by-ids)
 			     (else
@@ -114,11 +117,12 @@
 			     (map make-indexed data))))        ;; add each element keyed by the keynum'th val
 		    (else 
 		     ;; (debug:print-info 2 "Non-get runs call")
 		     (map make-indexed newdat))))
     ;; (debug:print-info 2 "postdat: " postdat)
+    (if (not indb)(sqlite3:finalize! db))
     (if (not synchash)
 	(begin
 	  (set! synchash (make-hash-table))
 	  (hash-table-set! *synchashes* synckey synchash)))
     (synchash:get-delta postdat synchash)))