@@ -25,10 +25,12 @@
 (declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
 (declare (uses daemon))
 (declare (uses db))
+(declare (uses sdb))
+(declare (uses filedb))
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
@@ -238,10 +240,13 @@
 			"-cleanup-db"
 			"-rollup"
 			"-update-meta"
 			"-gen-megatest-area"
 			"-mark-incompletes"
+
+			"-convert-to-norm"
+			"-convert-to-old"
 
 			"-logging"
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 		       )
@@ -627,12 +632,12 @@
 			   	     (equal? (db:test-get-status test) "WARN")
 				     (equal? (db:test-get-state test)  "NOT_STARTED")))
 			    (begin
 			      (print   "         cpuload:  " (db:test-get-cpuload test)
 				     "\n         diskfree: " (db:test-get-diskfree test)
-				     "\n         uname:    " (db:test-get-uname test)
-				     "\n         rundir:   " (db:test-get-rundir test)
+				     "\n         uname:    " (sdb:qry 'getstr (db:test-get-uname test))
+				     "\n         rundir:   " (filedb:get-path *fdb* (db:test-get-rundir test))
 				     )
 			      ;; Each test
 			      ;; DO NOT remote run
 			      (let ((steps (db:get-steps-for-test db (db:test-get-id test))))
 				(for-each 
@@ -964,10 +969,11 @@
 	      ;; has sub commands that are rdb:
 	      ;; DO NOT put this one into either cdb:remote-run or open-run-close
 	      (tdb:load-test-data test-id))
 	  (if (args:get-arg "-setlog")
 	      (let ((logfname (args:get-arg "-setlog")))
+		;; (cdb:test-set-log! *runremote* test-id (sdb:qry 'getid logfname))))
 		(rmt:test-set-log! test-id logfname)))
 	  (if (args:get-arg "-set-toplog")
 	      ;; DO NOT run remote
 	      (tests:test-set-toplog! run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-summarize-items")
@@ -1009,10 +1015,11 @@
 			  (debug:print-info 2 "running \"" cmd "\"")
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
+			  ;; (cdb:test-set-log! *runremote* test-id (sdb:qry 'getid htmllogfile))))
 			  (rmt:test-set-log! test-id htmllogfile)))
 		    (let ((msg (args:get-arg "-m")))
 		      (rmt:teststep-set-status! test-id stepname "end" exitstat msg logfile))
 		    )))
 	  (if (or (args:get-arg "-test-status")
@@ -1159,10 +1166,35 @@
 	    (if (args:get-arg "-repl")
 		(repl)
 		(load (args:get-arg "-load"))))
 	  (exit))
       (set! *didsomething* #t)))
+
+(if (args:get-arg "-convert-to-norm")
+    (let* ((toppath (setup-for-run))
+	   (db      (if toppath (open-db) #f)))
+      (for-each 
+       (lambda (field)
+	 (let ((dat '()))
+	   (debug:print-info 0 "Getting data for field " field)
+	   (sqlite3:for-each-row
+	    (lambda (id val)
+	      (set! dat (cons (list id val) dat)))
+	    db
+	    (conc "SELECT id," field " FROM tests;"))
+	   (debug:print-info 0 "found " (length dat) " items for field " field)
+	   (let ((qry (sqlite3:prepare db (conc "UPDATE tests SET " field "=? WHERE id=?;"))))
+	     (for-each
+	      (lambda (item)
+		(let ((newval (sdb:qry 'getid (cadr item))))
+		  (if (not (equal? newval (cadr item)))
+		      (debug:print-info 0 "Converting " (cadr item) " to " newval " for test #" (car item)))
+		  (sqlite3:execute qry newval (car item))))
+	      dat)
+	     (sqlite3:finalize! qry))))
+       (list "uname" "rundir" "final_logf" "comment"))
+      (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
@@ -1171,10 +1203,13 @@
 ;; this is the socket if we are a client
 ;; (if (and *runremote*
 ;; 	 (socket? *runremote*))
 ;;     (close-socket *runremote*))
 
+(if sdb:qry (sdb:qry 'finalize #f))
+(if *fdb*   (filedb:finalize-db! *fdb*))
+
 (if (not *didsomething*)
     (debug:print 0 help))
 
 ;; (if *runremote* (rpc:close-all-connections!))