@@ -1580,17 +1580,17 @@
 ;;
 ;; NOTE: This DOESN'T (necessarily) get the real run ids, but the number of the <number>.db!!
 
 (define (db:get-changed-run-ids since-time)
   (let* ((dbdir      (db:dbfile-path)) ;; (configf:lookup *configdat* "setup" "dbdir"))
-	 (alldbs     (glob (conc dbdir "/.mtdb/[0-9]*.db*")))
+	 (alldbs     (glob (conc *toppath* "/.mtdb/[0-9]*.db*")))
 	 (changed    (filter (lambda (dbfile)
 			       (> (file-modification-time dbfile) since-time))
 			     alldbs)))
     (delete-duplicates
      (map (lambda (dbfile)
-	    (let* ((res (string-match ".*\\/(\\d\\d)\\.db*" dbfile)))
+	    (let* ((res (string-match ".*\\/(\\d+)\\.db*" dbfile)))
 	      (if res
 		  (string->number (cadr res))
 		  (begin
 		    (debug:print 2 *default-log-port* "WARNING: Failed to process " dbfile " for run-id")
 		    0))))
@@ -4012,11 +4012,11 @@
 	 (delete-duplicates result)))))
 
 ;;======================================================================
 ;; To sync individual run
 ;;======================================================================
-(define (db:get-run-record-ids dbstruct target run keynames test-patt)
+(define (db:get-run-record-ids dbstruct target run keynames)
    (let* ((backcons (lambda (lst item)(cons item lst)))
          (all_tests '())
          (keystr (string-intersperse 
 	                  (map (lambda (key val)
 			    (conc key " like '" val "'"))
@@ -4023,39 +4023,19 @@
 			     keynames 
 			     (string-split target "/"))
 		              " AND ")
          )
          (run-qry (conc "SELECT id FROM runs  WHERE " keystr  " and runname='" run"'"))
-         (test-qry (conc "SELECT id FROM tests WHERE run_id in (" run-qry ") and testname like '" test-patt "'"))
+        ; (test-qry (conc "SELECT id FROM tests WHERE run_id in (" run-qry ") and testname like '" test-patt "'"))
          (run_ids 
            (db:with-db dbstruct #f #f 
              (lambda (dbdat db)
                (sqlite3:fold-row backcons '() db run-qry))
            )
          )
-        )
-        (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 (conc "SELECT id FROM tests WHERE run_id in (" run_id ") and testname like '" test-patt "'"))
-                  )
-                )
-               ) all_tests
-              )
-            )
-          )
-          run_ids
-        )
-      `((runs       . ,run_ids)
-        (tests      . ,all_tests)
-       )
-     
-   )
+       )
+      run_ids)
 )
 
 ;;======================================================================
 ;; Just for sync, procedures to make sync easy
 ;;======================================================================
@@ -4117,10 +4097,38 @@
         (tests      . ,all_tests)
        )
   )
 )
 
+
+
+(define (db:get-changed-record-test-ids dbstruct since-time run-id)
+   (let* ((backcons   (lambda (lst item)(cons item lst)))
+          (all-tests  (db:with-db dbstruct run-id #f 
+                        (lambda (dbdat db)
+                          (sqlite3:fold-row backcons '() db "SELECT id FROM tests  WHERE run_id=? and last_update>=?" run-id since-time)))))
+               
+            all-tests))
+
+(define (db:get-changed-record-run-ids dbstruct since-time)
+  ;; no transaction, allow the db to be accessed between the big queries
+  (let* ((backcons        (lambda (lst item)(cons item lst)))
+         (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)))))
+        (debug:print 2 *default-log-port*  "run_ids = " run_ids)
+        run_ids)
+)
+
+(define (db:get-all-runids dbstruct) 
+  (let* ((backcons        (lambda (lst item)(cons item lst)))
+         (all_run_ids     (db:with-db dbstruct #f #f 
+                            (lambda (dbdat db)
+                              (sqlite3:fold-row backcons '() db "SELECT id FROM runs")))))
+
+all_run_ids))
+
 ;;======================================================================
 ;; Extract ods file from the db
 ;;======================================================================
 
 ;; NOT REWRITTEN YET!!!!!