Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -50,11 +50,11 @@
 	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) -o dboard
 
 ndboard : newdashboard.scm $(OFILES) $(GOFILES)
 	csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
 
-mtut: $(OFILES) mtut.scm
+mtut: $(OFILES) megatest-fossil-hash.scm mtut.scm
 	csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut
 
 TCMTOBJS = \
 	api.o \
 	archive.o \
@@ -146,10 +146,13 @@
 	chmod a+x $(PREFIX)/bin/newdashboard
 
 $(PREFIX)/bin/.$(ARCHSTR)/mtut : mtut
 	$(INSTALL) mtut $(PREFIX)/bin/.$(ARCHSTR)/mtut
 
+install-mtut : mtut
+	$(INSTALL) mtut $(PREFIX)/bin/mtut
+
 $(PREFIX)/bin/mtutil : $(PREFIX)/bin/.$(ARCHSTR)/mtut utils/mk_wrapper
 	utils/mk_wrapper $(PREFIX) mtut $(PREFIX)/bin/mtutil
 	chmod a+x $(PREFIX)/bin/mtutil
 
 $(PREFIX)/bin/.$(ARCHSTR)/tcmt : tcmt

Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -277,10 +277,11 @@
                    ((get-run-stats)                (apply db:get-run-stats dbstruct params))
 
                    ;; STEPS
                    ((get-steps-data)               (apply db:get-steps-data dbstruct params))
                    ((get-steps-for-test)           (apply db:get-steps-for-test dbstruct params))
+		   ((get-steps-info-by-id)         (apply db:get-steps-info-by-id dbstruct params))
 
                    ;; TEST DATA
                    ((read-test-data)               (apply db:read-test-data dbstruct params))
                    ((read-test-data*)              (apply db:read-test-data* dbstruct params))
 

Index: cgisetup/models/pgdb.scm
==================================================================
--- cgisetup/models/pgdb.scm
+++ cgisetup/models/pgdb.scm
@@ -128,10 +128,36 @@
     (dbi:exec
    dbh
    "INSERT INTO runs (ttype_id,target,run_name,state,status,owner,event_time,comment,fail_count,pass_count)
       VALUES (?,?,?,?,?,?,?,?,?,?);"
     ttype-id target run-name state status owner event-time comment fail-count pass-count))
+
+;;======================================================================
+;;  T E S T - S T E P S
+;;======================================================================
+
+(define (pgdb:get-test-step-id dbh test-id stepname)
+  (dbi:get-one
+    dbh
+    "SELECT id FROM test_steps WHERE test_id=? AND stepname=? ;"
+    test-id stepname))
+
+(define (pgdb:insert-test-step dbh test-id stepname state status event_time comment logfile)
+  (dbi:exec
+   dbh
+   "INSERT INTO test_steps (test_id,stepname,state,status,event_time,logfile,comment)
+       VALUES (?,?,?,?,?,?,?);"
+   test-id stepname  state   status  event_time   logfile   comment))
+
+(define (pgdb:update-test-step dbh step-id test-id stepname state status event_time comment logfile)
+  (dbi:exec
+    dbh
+    "UPDATE test_steps SET
+         test_id=?,stepname=?,state=?,status=?,event_time=?,logfile=?,comment=?
+          WHERE id=?;"
+    test-id stepname  state   status  event_time   logfile   comment step-id))
+
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================
 

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -3105,10 +3105,25 @@
 	  (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment) res)))
 	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)
+   (db:with-db
+    dbstruct
+    #f 
+    #f
+    (lambda (db)
+      (let* ((res (vector #f #f #f #f #f #f #f #f)))
+        (sqlite3:for-each-row 
+       (lambda (id test-id stepname state status event-time logfile comment)
+         (set! res (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment)))
+       db
+       "SELECT id,test_id,stepname,state,status,event_time,logfile,comment FROM test_steps WHERE status != 'DELETED' AND id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
+       test-step-id)
+        res))))
 
 (define (db:get-steps-data dbstruct run-id test-id)
   (db:with-db
    dbstruct
    run-id

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -814,10 +814,13 @@
     (rmt:send-receive 'teststep-set-status! run-id (list run-id test-id teststep-name state-in status-in comment logfile))))
 
 (define (rmt:get-steps-for-test run-id test-id)
   (rmt:send-receive 'get-steps-for-test run-id (list run-id test-id)))
 
+(define (rmt:get-steps-info-by-id test-step-id)
+  (rmt:send-receive 'get-steps-info-by-id #f (list test-step-id)))
+
 ;;======================================================================
 ;;  T E S T   D A T A 
 ;;======================================================================
 
 (define (rmt:read-test-data run-id test-id categorypatt #!key (work-area #f)) 

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -648,18 +648,14 @@
 	       			(conc "MT_CONTOUR/MT_AREA/" (string-intersperse (rmt:get-keys) "/")) (string-intersperse (rmt:get-keys) "/"))) ;; e.g. version/iteration/platform
 	       (target     (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target")) 
 	       			(conc (or (args:get-arg "-prefix-target") (conc contour "/" (common:get-area-name) "/")) (rmt:get-target run-id)) (rmt:get-target run-id)))                 ;; e.g. v1.63/a3e1/ubuntu
 	       (spec-id    (pgdb:get-ttype dbh keytarg))
 	       (new-run-id (pgdb:get-run-id dbh spec-id target run-name))
-
-
-
 	       ;; (area-id    (db:get-value-by-header row header "area_id)"))
 	       )
           (if new-run-id
 	      (begin ;; let ((run-record (pgdb:get-run-info dbh new-run-id))
-                
 		(hash-table-set! runs-ht run-id new-run-id)
 		;; ensure key fields are up to date
 		(pgdb:refresh-run-info
 		 dbh
 		 new-run-id
@@ -667,17 +663,54 @@
 		new-run-id)
 	      (if (handle-exceptions
 		      exn
 		      (begin (print-call-chain)
                               (print ((condition-property-accessor 'exn 'message) exn))     
-#f)
-                     
+			#f)
 		    (pgdb:insert-run
 		     dbh
 		     spec-id target run-name state status owner event-time comment fail-count pass-count)) ;; area-id))
 		       (tasks:run-id->mtpg-run-id dbh cached-info run-id)
 		  #f))))))
+
+
+(define (tasks:sync-test-steps dbh cached-info test-step-ids)
+  (let ((test-ht (hash-table-ref cached-info 'tests))
+        (step-ht (hash-table-ref cached-info 'steps)))
+    (for-each
+     (lambda (test-step-id)
+        (let* ((test-step-info  (rmt:get-steps-info-by-id test-step-id))
+               (step-id (tdb:step-get-id test-step-info))
+               (test-id  (tdb:step-get-test_id    test-step-info))   
+	       (stepname (tdb:step-get-stepname  test-step-info))
+	       (state (tdb:step-get-state test-step-info))	
+	       (status (tdb:step-get-status test-step-info))	
+	       (event_time (tdb:step-get-event_time  test-step-info))	
+	       (comment  (tdb:step-get-comment test-step-info))	
+	       (logfile (tdb:step-get-logfile test-step-info))	
+	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
+               (pgdb-step-id (if pgdb-test-id 
+                                 (pgdb:get-test-step-id dbh pgdb-test-id stepname)
+                                  #f)))
+    (if step-id
+      (begin  
+        (if pgdb-test-id
+           (begin 
+                (if  pgdb-step-id
+                   (begin
+                    (print "Updating existing test-step with test-id: " test-id " and step-id " step-id)
+                    (pgdb:update-test-step dbh pgdb-step-id pgdb-test-id stepname state status event_time comment logfile))
+                    (begin
+ 		      (print "Updating existing test-step with test-id: " test-id " and step-id " step-id)
+                      (pgdb:insert-test-step dbh pgdb-test-id stepname state status event_time comment logfile )
+                      (set! pgdb-step-id  (pgdb:get-test-step-id dbh pgdb-test-id stepname))))
+                (hash-table-set! step-ht step-id pgdb-step-id )
+		(print test-step-info " test-step-id: " test-step-id " pgdb-test-id: " pgdb-test-id))
+           (print "Error: Test not cashed")))
+      (print "Error: Could not get test step info for step id " test-step-id ))))	;; this is a wierd senario need to debug      	
+   test-step-ids)))
+
 
 (define (tasks:sync-tests-data dbh cached-info test-ids)
   (let ((test-ht (hash-table-ref cached-info 'tests)))
     (for-each
      (lambda (test-id)
@@ -710,16 +743,19 @@
 	 ;; "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived"
          (if pgdb-run-id
            (begin
 	   (if pgdb-test-id ;; have a record
 	     (begin ;; let ((key-name (conc run-id "/" test-name "/" item-path)))
-	       (hash-table-set! test-ht test-id pgdb-test-id)
 	       (print "Updating existing test with run-id: " run-id " and test-id: " test-id)
 	       (pgdb:update-test dbh pgdb-test-id pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived))
-	     (pgdb:insert-test dbh pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived)))
-              (print "WARNING: Skipping run with run-id:" run-id ". This run was created after privious sync and removed before this sync."))   
-	 ))
+	     (begin 
+                 (print "Inserting test with run-id: " run-id " and test-id: " test-id)
+
+                (pgdb:insert-test dbh pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived)
+                (set! pgdb-test-id (pgdb:get-test-id dbh pgdb-run-id test-name item-path))))
+               (hash-table-set! test-ht test-id pgdb-test-id))
+              (print "WARNING: Skipping run with run-id:" run-id ". This run was created after privious sync and removed before this sync."))))
      test-ids)))
 
 ;; get runs changed since last sync
 ;; (define (tasks:sync-test-data dbh cached-info area-info)
 ;;   (let* ((
@@ -729,11 +765,11 @@
 	 (area-info   (pgdb:get-area-by-path dbh *toppath*))
 	 (cached-info (make-hash-table))
 	 (start       (current-seconds)))
     (for-each (lambda (dtype)
 		(hash-table-set! cached-info dtype (make-hash-table)))
-	      '(runs targets tests))
+	      '(runs targets tests steps))
     (hash-table-set! cached-info 'start start) ;; when done we'll set sync times to this
     (if area-info
 	(let* ((last-sync-time (vector-ref area-info 3))
 	       (changed        (rmt:get-changed-record-ids last-sync-time))
 	       (run-ids        (alist-ref 'runs       changed))
@@ -742,14 +778,16 @@
 	       (test-data-ids  (alist-ref 'test_data  changed))
 	       (run-stat-ids   (alist-ref 'run_stats  changed)))
 	  ;(print "area-info: " area-info)
 	  (if (not (null? test-ids))
 	      (begin
-		(print "Syncing " (length test-ids) " changed tests")
-		(tasks:sync-tests-data dbh cached-info test-ids)))
-	  (pgdb:write-sync-time dbh area-info start))
+		(print "Syncing " (length test-step-ids) " changed tests")
+		(tasks:sync-tests-data dbh cached-info test-ids)
+                (tasks:sync-test-steps dbh cached-info test-step-ids)))
+	  ;(pgdb:write-sync-time dbh area-info start)
+)
 	(if (tasks:set-area dbh configdat)
 	    (tasks:sync-to-postgres configdat dest)
 	    (begin
 	      (debug:print 0 *default-log-port* "ERROR: unable to create an area record")
 	      #f)))))