Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -637,11 +637,15 @@
 	       (owner      (db:get-value-by-header row header "owner"))
 	       (event-time (db:get-value-by-header row header "event_time"))
 	       (comment    (db:get-value-by-header row header "comment"))
 	       (fail-count (db:get-value-by-header row header "fail_count"))
 	       (pass-count (db:get-value-by-header row header "pass_count"))
-	       (contour    (if (args:get-arg "-prepend-contour") (db:get-value-by-header row header "contour")))
+               (db-contour (db:get-value-by-header row header "contour"))
+	       (contour    (if (args:get-arg "-prepend-contour") 
+                                 (if (> (string-length  db-contour) 0) 
+                                            db-contour
+					    (args:get-arg "-contour"))))
 	       (keytarg    (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target"))
 	       			(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))
@@ -649,12 +653,11 @@
 
 
 
 	       ;; (area-id    (db:get-value-by-header row header "area_id)"))
 	       )
-           
-	  (if new-run-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
@@ -697,11 +700,11 @@
 	      (archived     (db:test-get-archived  test-info))
 	      (pgdb-run-id  (tasks:run-id->mtpg-run-id dbh cached-info run-id))
                 
 	      (pgdb-test-id (if pgdb-run-id 
 				(begin
-                                  (print pgdb-run-id)    
+                                  ;(print pgdb-run-id)    
                                  (pgdb:get-test-id dbh pgdb-run-id test-name item-path))
                                  #f)))
 	 ;; "id"           "run_id"        "testname"  "state"      "status"      "event_time"
 	 ;; "host"         "cpuload"       "diskfree"  "uname"      "rundir"      "item_path"
 	 ;; "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived"
@@ -711,11 +714,11 @@
 	     (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 "Skipping run with run-id:" run-id ". This run was created after privious sync and removed before this sync."))   
+              (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)
@@ -736,11 +739,11 @@
 	       (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-ids) " changed tests")
 		(tasks:sync-tests-data dbh cached-info test-ids)))
 	  (pgdb:write-sync-time dbh area-info start))