Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -282,10 +282,11 @@
 		   ((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))
+                   ((get-data-info-by-id)          (apply db:get-data-info-by-id dbstruct params)) 
 
                    ;; MISC
                    ((get-latest-host-load)         (apply db:get-latest-host-load dbstruct params))
                    ((have-incompletes?)            (apply db:have-incompletes? dbstruct params))
                    ((login)                        (apply db:login dbstruct params))

Index: cgisetup/models/pgdb.scm
==================================================================
--- cgisetup/models/pgdb.scm
+++ cgisetup/models/pgdb.scm
@@ -133,15 +133,15 @@
 
 ;;======================================================================
 ;;  T E S T - S T E P S
 ;;======================================================================
 
-(define (pgdb:get-test-step-id dbh test-id stepname)
+(define (pgdb:get-test-step-id dbh test-id stepname state)
   (dbi:get-one
     dbh
-    "SELECT id FROM test_steps WHERE test_id=? AND stepname=? ;"
-    test-id stepname))
+    "SELECT id FROM test_steps WHERE test_id=? AND stepname=? and state = ? ;"
+    test-id stepname state))
 
 (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)
@@ -153,10 +153,37 @@
     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 - D A T A
+;;======================================================================
+
+(define (pgdb:get-test-data-id dbh test-id category variable)
+  (dbi:get-one
+    dbh
+    "SELECT id FROM test_data WHERE test_id=? AND category=? and variable = ? ;"
+    test-id category variable))
+
+(define (pgdb:insert-test-data dbh test-id category variable value expected tol units comment status type)
+  (dbi:exec
+   dbh
+   "INSERT INTO test_data (test_id, category, variable, value, expected, tol, units, comment, status, type)
+       VALUES (?,?,?,?,?,?,?,?,?,?);"
+   test-id category variable value expected tol units comment status type))
+
+(define (pgdb:update-test-data dbh data-id test-id  category variable value expected tol units comment status type)
+  (dbi:exec
+    dbh
+    "UPDATE test_data SET
+         test_id=?, category=?, variable=?, value=?, expected=?, tol=?, units=?, comment=?, status=?, type=?
+          WHERE id=?;"
+    test-id category variable value expected tol units comment status type data-id ))
+
 
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -3117,11 +3117,11 @@
       (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;
+       "SELECT id,test_id,stepname,state,status,event_time,logfile,comment FROM test_steps WHERE 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
@@ -3139,10 +3139,26 @@
        (reverse res)))))
 
 ;;======================================================================
 ;; T E S T  D A T A 
 ;;======================================================================
+
+ (define (db:get-data-info-by-id dbstruct  test-data-id)
+   (db:with-db
+    dbstruct
+    #f 
+    #f
+    (lambda (db)
+      (let* ((res (vector #f #f #f #f #f #f #f #f #f #f #f)))
+        (sqlite3:for-each-row 
+       (lambda (id test-id  category variable value expected tol units comment status type )
+         (set! res (vector id test-id  category variable value expected tol units comment status type)))
+       db
+       "SELECT id,test_id, category, variable, value, expected, tol, units, comment, status, type FROM test_data WHERE id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
+       test-data-id)
+        res))))
+
 
 ;; WARNING: Do NOT call this for the parent test on an iterated test
 ;; Roll up test_data pass/fail results
 ;; look at the test_data status field, 
 ;;    if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS.

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -826,10 +826,12 @@
 (define (rmt:read-test-data run-id test-id categorypatt #!key (work-area #f)) 
   (rmt:send-receive 'read-test-data run-id (list run-id test-id categorypatt)))
 (define (rmt:read-test-data* run-id test-id categorypatt varpatt #!key (work-area #f)) 
   (rmt:send-receive 'read-test-data* run-id (list run-id test-id categorypatt varpatt)))
 
+(define (rmt:get-data-info-by-id test-data-id)
+   (rmt:send-receive 'get-data-info-by-id #f (list test-data-id)))
 
 (define (rmt:testmeta-add-record testname)
   (rmt:send-receive 'testmeta-add-record #f (list testname)))
 
 (define (rmt:testmeta-get-record testname)

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -687,11 +687,11 @@
 	       (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)
+                                 (pgdb:get-test-step-id dbh pgdb-test-id stepname state)
                                   #f)))
     (if step-id
       (begin  
         (if pgdb-test-id
            (begin 
@@ -698,18 +698,59 @@
                 (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)
+ 		      (print "Inserting 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))
+                      (set! pgdb-step-id  (pgdb:get-test-step-id dbh pgdb-test-id stepname state))))
+                (hash-table-set! step-ht step-id pgdb-step-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-test-gen-data dbh cached-info test-data-ids)
+  (let ((test-ht (hash-table-ref cached-info 'tests))
+        (data-ht (hash-table-ref cached-info 'data)))
+    (print test-data-ids)
+    (for-each
+     (lambda (test-data-id)
+        (let* ((test-data-info  (rmt:get-data-info-by-id test-data-id))
+               (data-id (db:test-data-get-id  test-data-info))
+               (test-id  (db:test-data-get-test_id   test-data-info))   
+	       (category  (db:test-data-get-category  test-data-info))
+	       (variable  (db:test-data-get-variable test-data-info))	
+	       (value (db:test-data-get-value  test-data-info))	
+               (expected (db:test-data-get-expected  test-data-info))
+               (tol (db:test-data-get-tol  test-data-info))
+               (units (db:test-data-get-units  test-data-info))     
+	       (comment  (db:test-data-get-comment test-data-info))	
+               (status (db:test-data-get-status test-data-info))	
+	       (type (db:test-data-get-type test-data-info))	
+	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
+               (pgdb-data-id (if pgdb-test-id 
+                                 (pgdb:get-test-data-id dbh pgdb-test-id category variable)
+                                  #f)))
+    (if data-id
+      (begin
+        (if pgdb-test-id
+           (begin 
+                (if  pgdb-data-id
+                   (begin
+                    (print "Updating existing test-data with test-id: " test-id " and data-id " data-id)
+                    (pgdb:update-test-data dbh pgdb-data-id pgdb-test-id  category variable value expected tol units comment status type))
+                    (begin
+ 		      (print "Inserting test-data with test-id: " test-id " and data-id " data-id)
+                      (pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type )
+                      (set! pgdb-data-id  (pgdb:get-test-data-id dbh pgdb-test-id  category variable))))
+                (hash-table-set! data-ht data-id pgdb-data-id ))
+             (begin
+                 (print "Error: Test not in pgdb"))))
+
+      (print "Error: Could not get test data info for data id " test-data-id ))))	;; this is a wierd senario need to debug      	
+   test-data-ids)))
+
 
 
 (define (tasks:sync-tests-data dbh cached-info test-ids)
   (let ((test-ht (hash-table-ref cached-info 'tests)))
     (for-each
@@ -747,11 +788,10 @@
 	     (begin ;; let ((key-name (conc run-id "/" test-name "/" item-path)))
 	       (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))
 	     (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)))
@@ -765,29 +805,33 @@
 	 (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 steps))
+	      '(runs targets tests steps data))
     (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))
 	       (test-ids       (alist-ref 'tests      changed))
 	       (test-step-ids  (alist-ref 'test_steps changed))
 	       (test-data-ids  (alist-ref 'test_data  changed))
 	       (run-stat-ids   (alist-ref 'run_stats  changed)))
-	  ;(print "area-info: " area-info)
+	  (print "area-info: " area-info)
 	  (if (not (null? test-ids))
 	      (begin
 		(print "Syncing " (length test-step-ids) " changed tests")
+                
+                ;;Assumption here is that if test-step or test data is changed then the test last update time is changed 
 		(tasks:sync-tests-data dbh cached-info test-ids)
-                (tasks:sync-test-steps dbh cached-info test-step-ids)))
+                (tasks:sync-test-steps dbh cached-info test-step-ids)
+                (tasks:sync-test-gen-data dbh cached-info test-data-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)))))