Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -418,12 +418,12 @@
     (no-sync-db        (db:open-no-sync-db)))
     (for-each
      (lambda (file) ;; tmp db file
        (debug:print-info 3 *default-log-port* "file: " file)
        (let* ((fname       (conc (pathname-file file) ".db")) ;; fname is tmp db file
-              (wal-file (conc fname "-wal"))
-              (shm-file (conc fname "-shm"))
+              (wal-file (conc file "-wal"))
+              (shm-file (conc file "-shm"))
 	      (fulln       (conc *toppath*"/.megatest/"fname)) ;; fulln is nfs db name
               (wal-time     (if (file-exists? wal-file)             
 			       (file-modification-time wal-file)
                                0))
               (shm-time     (if (file-exists? shm-file)             
@@ -438,11 +438,11 @@
 	      (time2       (if (file-exists? fulln)             ;; time2 is nfs file time
 			       (file-modification-time fulln)
 			       (begin
 				 (debug:print-info 2 *default-log-port* "Sync - I do not see file "fulln)
 				 0)))
-	      (changed      (> (- time1 time2) (+ (random 5) 1)))  ;; it has been at some few seconds since last synced
+	      (changed      (> (- time1 time2) (+ (random 5) 1)))  ;; it has been a few seconds since last synced
 	      (changed10    (> (- time1 time2) 10)) ;; it has been at least ten seconds since sync'd
 	      (jfile-exists (file-exists? (conc file"-journal"))) ;; i.e. are we busy?
 	      (do-cp        (cond
 			     ((not (file-exists? fulln)) ;; shouldn't happen, but this might recover
 			      (cons #t (conc "File "fulln" not found! Copying "fname" to "fulln)))
@@ -520,10 +520,11 @@
               (run-id (if (string= basename "main") #f (string->number basename)))
 	      (destfile (conc dest-area "/.megatest/" fname))
               (dest-directory  (conc dest-area "/.megatest/"))
               (dummy (debug:print-info 2 *default-log-port* "destfile = " destfile))
               (dummy2 (debug:print-info 2 *default-log-port* "dejunk = " dejunk))
+              ;; TODO: time1 and time2 need to take into account -wal and -shm files
 	      (time1 (file-modification-time srcfile))
               (time2 (if (file-exists? destfile)
                          (begin
                             (debug:print-info 2 *default-log-port* "destfile " destfile " exists")
 			    (file-modification-time destfile)