@@ -3122,14 +3122,14 @@
 	db
 	"SELECT id,test_id,stepname,state,status,event_time,logfile,comment FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
 	test-id)
        (reverse res)))))
 
- (define (db:get-steps-info-by-id dbstruct  test-step-id)
+ (define (db:get-steps-info-by-id dbstruct run-id test-step-id)
    (db:with-db
     dbstruct
-    #f 
+    run-id
     #f
     (lambda (dbdat db)
       (let* ((res (vector #f #f #f #f #f #f #f #f #f)))
         (sqlite3:for-each-row 
        (lambda (id test-id stepname state status event-time logfile comment last-update)
@@ -3156,15 +3156,15 @@
 
 ;;======================================================================
 ;; T E S T  D A T A 
 ;;======================================================================
 
-(define (db:get-data-info-by-id dbstruct  test-data-id)
+(define (db:get-data-info-by-id dbstruct run-id test-data-id)
   (let* ((stmt        "SELECT id,test_id, category, variable, value, expected, tol, units, comment, status, type, last_update FROM test_data WHERE id=? ORDER BY id ASC;")) ;; event_time DESC,id ASC;
     (db:with-db
      dbstruct
-     #f 
+     run-id
      #f
      (lambda (dbdat db)
        (let* ((stmth (db:get-cache-stmth dbdat #f db stmt))
 	      (res   (sqlite3:fold-row
 		      (lambda (res id test-id  category variable value expected tol units comment status type last-update)
@@ -4374,26 +4374,82 @@
 
 ;;======================================================================
 ;; Just for sync, procedures to make sync easy
 ;;======================================================================
 
-;; get an alist of record ids changed since time since-time
-;;   '((runs . (1 2 3 ...))(steps . (5 6 7 ...) ...))
+;; get an alist of run ids and test/run, test_step/run pairs changed since time since-time
+;;   '((runs . (1 2 3 ...))(tests . ((5 . 1) (6 . 3) (6 . 2) (7 . 1)  ...
 ;;
 (define (db:get-changed-record-ids dbstruct since-time)
   ;; no transaction, allow the db to be accessed between the big queries
-  (let ((backcons (lambda (lst item)(cons item lst))))
-    (db:with-db
-     dbstruct #f #f 
-     (lambda (dbdat db)
-       `((runs       . ,(sqlite3:fold-row backcons '() db "SELECT id FROM runs  WHERE last_update>=?" since-time))
-	 (tests      . ,(sqlite3:fold-row backcons '() db "SELECT id FROM tests WHERE last_update>=?" since-time))
-	 (test_steps . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>=?" since-time))
-	 (test_data  . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_data  WHERE last_update>=?" since-time))
-	 ;; (test_meta  . ,(fold-row backcons '() db "SELECT id FROM test_meta  WHERE last_update>?" since-time))
-	 (run_stats  . ,(sqlite3:fold-row backcons '() db "SELECT id FROM run_stats  WHERE last_update>=?" since-time))
-	 )))))
+  (let* ((backcons (lambda (lst item)(cons item lst)))
+         (all_tests '())
+         (all_test_steps '())
+         (all_test_data '())
+
+         (run_ids 
+          (db:with-db dbstruct #f #f 
+            (lambda (dbdat db)
+              (sqlite3:fold-row backcons '() db "SELECT id FROM runs  WHERE last_update>=?" since-time))
+          )
+         )
+         (run_stat_ids
+          (db:with-db dbstruct #f #f 
+            (lambda (dbdat db)
+              (sqlite3:fold-row backcons '() db "SELECT id FROM run_stats  WHERE last_update>=?" since-time))
+          )
+         )
+        )
+        (for-each
+          (lambda (run_id)
+            (set! all_tests 
+             (append 
+               (map (lambda (x) (cons x run_id))                
+                (db:with-db dbstruct run_id #f 
+                  (lambda (dbdat db)
+                    (sqlite3:fold-row backcons '() db "SELECT id FROM tests  WHERE last_update>=?" since-time)
+                  )
+                )
+               ) all_tests
+              )
+            )
+            (set! all_test_steps 
+              (append 
+                (map (lambda (x) (cons x run_id))
+                  (db:with-db dbstruct run_id #f 
+                    (lambda (dbdat db)
+                      (sqlite3:fold-row backcons '() db "SELECT id FROM test_steps  WHERE last_update>=?" since-time)
+                    )
+                  )
+                ) all_test_steps
+              )
+            )
+            (set! all_test_data 
+              (append 
+                (map (lambda (x) (cons x run_id))
+                  (db:with-db dbstruct run_id #f 
+                    (lambda (dbdat db)
+                      (sqlite3:fold-row backcons '() db "SELECT id FROM test_data  WHERE last_update>=?" since-time)
+                    )
+                  )
+                ) all_test_data
+              )
+            )
+          )
+          run_ids
+        )
+        (debug:print 2 *default-log-port*  "run_ids = " run_ids)
+        (debug:print 2 *default-log-port*  "all_tests = " all_tests)
+
+      `((runs       . ,run_ids)
+        (tests      . ,all_tests)
+        (test_steps . ,all_test_steps)
+        (test_data  . ,all_test_data)
+        (run_stats  . ,run_stat_ids)
+       )
+  )
+)
 
 ;;======================================================================
 ;; Extract ods file from the db
 ;;======================================================================