Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -533,10 +533,11 @@
 
 (define (rmt:get-targets)
   (rmt:send-receive 'get-targets #f '()))
 
 (define (rmt:get-target run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-target run-id (list run-id)))
 
 (define (rmt:get-run-times runpatt targetpatt)
   (rmt:send-receive 'get-run-times #f (list runpatt targetpatt ))) 
 
@@ -545,13 +546,15 @@
 ;;  T E S T S
 ;;======================================================================
 
 ;; Just some syntatic sugar
 (define (rmt:register-test run-id test-name item-path)
+  (assert (number? run-id) "Run id required.")
   (rmt:general-call 'register-test run-id run-id test-name item-path))
 
 (define (rmt:get-test-id run-id testname item-path)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-test-id run-id (list run-id testname item-path)))
 
 ;; run-id is NOT used
 ;;
 (define (rmt:get-test-info-by-id run-id test-id)
@@ -564,39 +567,46 @@
 
 (define (rmt:test-get-rundir-from-test-id run-id test-id)
   (rmt:send-receive 'test-get-rundir-from-test-id run-id (list run-id test-id)))
 
 (define (rmt:open-test-db-by-test-id run-id test-id #!key (work-area #f))
+  (assert (number? run-id) "Run id required.")
   (let* ((test-path (if (string? work-area)
 			work-area
 			(rmt:test-get-rundir-from-test-id run-id test-id))))
     (debug:print 3 *default-log-port* "TEST PATH: " test-path)
     (open-test-db test-path)))
 
 ;; WARNING: This currently bypasses the transaction wrapped writes system
 (define (rmt:test-set-state-status-by-id run-id test-id newstate newstatus newcomment)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-set-state-status-by-id run-id (list run-id test-id newstate newstatus newcomment)))
 
-(define (rmt:set-tests-state-status run-id                      testnames currstate currstatus newstate newstatus)
+(define (rmt:set-tests-state-status run-id testnames currstate currstatus newstate newstatus)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'set-tests-state-status run-id (list run-id testnames currstate currstatus newstate newstatus)))
 
 (define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
+  (assert (number? run-id) "Run id required.")
   ;; (if (number? run-id)
   (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)))
   ;;    (begin
   ;;	(debug:print-error 0 *default-log-port* "rmt:get-tests-for-run called with bad run-id=" run-id)
   ;;	(print-call-chain (current-error-port))
   ;;	'())))
 
 (define (rmt:get-tests-for-run-state-status run-id testpatt last-update)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-tests-for-run-state-status run-id (list run-id testpatt last-update)))
 
 ;; get stuff via synchash 
 (define (rmt:synchash-get run-id proc synckey keynum params)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'synchash-get run-id (list run-id proc synckey keynum params)))
 
 (define (rmt:get-tests-for-run-mindata run-id testpatt states status not-in)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-id testpatt states status not-in)))
   
 ;; IDEA: Threadify these - they spend a lot of time waiting ...
 ;;
 (define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
@@ -639,40 +649,50 @@
 ;;     (apply append (map (lambda (run-id)
 ;; 			 (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-ids testpatt states status not-in)))
 ;; 		       run-id-list))))
 
 (define (rmt:delete-test-records run-id test-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'delete-test-records run-id (list run-id test-id)))
 
 (define (rmt:test-set-state-status run-id test-id state status msg)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-set-state-status run-id (list run-id test-id state status msg)))
 
 (define (rmt:test-toplevel-num-items run-id test-name)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-toplevel-num-items run-id (list run-id test-name)))
 
 ;; (define (rmt:get-previous-test-run-record run-id test-name item-path)
 ;;   (rmt:send-receive 'get-previous-test-run-record run-id (list run-id test-name item-path)))
 
 (define (rmt:get-matching-previous-test-run-records run-id test-name item-path)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-matching-previous-test-run-records run-id (list run-id test-name item-path)))
 
 (define (rmt:test-get-logfile-info run-id test-name)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-get-logfile-info run-id (list run-id test-name)))
 
 (define (rmt:test-get-records-for-index-file run-id test-name)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-get-records-for-index-file run-id (list run-id test-name)))
 
 (define (rmt:get-testinfo-state-status run-id test-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-testinfo-state-status run-id (list run-id test-id)))
 
 (define (rmt:test-set-log! run-id test-id logf)
+  (assert (number? run-id) "Run id required.")
   (if (string? logf)(rmt:general-call 'test-set-log run-id logf test-id)))
 
 (define (rmt:test-set-top-process-pid run-id test-id pid)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-set-top-process-pid run-id (list run-id test-id pid)))
 
 (define (rmt:test-get-top-process-pid run-id test-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-get-top-process-pid run-id (list run-id test-id)))
 
 (define (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)
   (rmt:send-receive 'get-run-ids-matching-target #f (list keynames target res runname testpatt statepatt statuspatt)))
 
@@ -684,57 +704,71 @@
 	   (map (lambda (run-id)
 		  (rmt:send-receive 'test-get-paths-matching-keynames-target-new run-id (list run-id keynames target res testpatt statepatt statuspatt runname)))
 	   run-ids))))
 
 (define (rmt:get-prereqs-not-met run-id waitons ref-test-name ref-item-path #!key (mode '(normal))(itemmaps #f))
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-prereqs-not-met run-id (list run-id waitons ref-test-name ref-item-path mode itemmaps)))
 
 (define (rmt:get-count-tests-running-for-run-id run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id)))
 
 (define (rmt:get-not-completed-cnt run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-not-completed-cnt run-id (list run-id)))
 
 
 ;; Statistical queries
 
 (define (rmt:get-count-tests-running run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-count-tests-running run-id (list run-id)))
 
 (define (rmt:get-count-tests-running-for-testname run-id testname)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-count-tests-running-for-testname run-id (list run-id testname)))
 
 (define (rmt:get-count-tests-running-in-jobgroup run-id jobgroup)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-count-tests-running-in-jobgroup run-id (list run-id jobgroup)))
 
 ;; state and status are extra hints not usually used in the calculation
 ;;
 (define (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status comment)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'set-state-status-and-roll-up-items run-id (list run-id test-name item-path state status comment)))
 
 (define (rmt:set-state-status-and-roll-up-run run-id state status)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'set-state-status-and-roll-up-run run-id (list run-id state status)))
 
 
 (define (rmt:update-pass-fail-counts run-id test-name)
+  (assert (number? run-id) "Run id required.")
   (rmt:general-call 'update-pass-fail-counts run-id test-name test-name test-name))
 
 (define (rmt:top-test-set-per-pf-counts run-id test-name)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'top-test-set-per-pf-counts run-id (list run-id test-name)))
 
 (define (rmt:get-raw-run-stats run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-raw-run-stats run-id (list run-id)))
 
 (define (rmt:get-test-times runname target)
   (rmt:send-receive 'get-test-times #f (list runname target ))) 
 
 ;;======================================================================
 ;;  R U N S
 ;;======================================================================
 
+;; BUG - LOOK AT HOW THIS WORKS!!!
+;;
 (define (rmt:get-run-info run-id)
-  (rmt:send-receive 'get-run-info run-id (list run-id)))
+  (assert (number? run-id) "Run id required.")
+  (rmt:send-receive 'get-run-info #f (list run-id)))
 
 (define (rmt:get-num-runs runpatt)
   (rmt:send-receive 'get-num-runs #f (list runpatt)))
 
 (define (rmt:get-runs-cnt-by-patt runpatt targetpatt keys)
@@ -743,14 +777,15 @@
 ;; Use the special run-id == #f scenario here since there is no run yet
 (define (rmt:register-run keyvals runname state status user contour)
   (rmt:send-receive 'register-run #f (list keyvals runname state status user contour)))
     
 (define (rmt:get-run-name-from-id run-id)
-  (rmt:send-receive 'get-run-name-from-id run-id (list run-id)))
+  (assert (number? run-id) "Run id required.")
+  (rmt:send-receive 'get-run-name-from-id #f (list run-id)))
 
 (define (rmt:delete-run run-id)
-  (rmt:send-receive 'delete-run run-id (list run-id)))
+  (rmt:send-receive 'delete-run #f (list run-id)))
 
 (define (rmt:update-run-stats run-id stats)
   (rmt:send-receive 'update-run-stats #f (list run-id stats)))
 
 (define (rmt:delete-old-deleted-test-records)
@@ -764,43 +799,52 @@
 
 (define (rmt:get-all-run-ids)
   (rmt:send-receive 'get-all-run-ids #f '()))
 
 (define (rmt:get-prev-run-ids run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-prev-run-ids #f (list run-id)))
 
 (define (rmt:lock/unlock-run run-id lock unlock user)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'lock/unlock-run #f (list run-id lock unlock user)))
 
 ;; set/get status
 (define (rmt:get-run-status run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-run-status #f (list run-id)))
 
 (define (rmt:get-run-state run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-run-state #f (list run-id)))
 
 
 (define (rmt:set-run-status run-id run-status #!key (msg #f))
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'set-run-status #f (list run-id run-status msg)))
 
 (define (rmt:set-run-state-status run-id state status )
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'set-run-state-status #f (list run-id state status)))
 
 (define (rmt:update-tesdata-on-repilcate-db old-lt new-lt)
 (rmt:send-receive 'update-tesdata-on-repilcate-db #f (list old-lt new-lt)))
 
 (define (rmt:update-run-event_time run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'update-run-event_time #f (list run-id)))
 
 (define (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update  #!key  (sort-order "asc")) ;; fields of #f uses default
   (rmt:send-receive 'get-runs-by-patt #f (list keys runnamepatt targpatt offset limit fields last-runs-update sort-order)))
 
 (define (rmt:find-and-mark-incomplete run-id ovr-deadtime)
+  (assert (number? run-id) "Run id required.")
   ;; (if (rmt:send-receive 'have-incompletes? run-id (list run-id ovr-deadtime))
   (rmt:send-receive 'mark-incomplete run-id (list run-id ovr-deadtime))) ;; )
 
 (define (rmt:get-main-run-stats run-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-main-run-stats #f (list run-id)))
 
 (define (rmt:get-var varname)
   (rmt:send-receive 'get-var #f (list varname)))
 
@@ -877,38 +921,45 @@
 ;; 
 ;;(define (rmt:get-steps-for-test run-id test-id)
 ;;  (rmt:send-receive 'get-steps-data run-id (list test-id)))
 
 (define (rmt:teststep-set-status! run-id test-id teststep-name state-in status-in comment logfile)
+  (assert (number? run-id) "Run id required.")
   (let* ((state     (items:check-valid-items "state" state-in))
 	 (status    (items:check-valid-items "status" status-in)))
     (if (or (not state)(not status))
 	(debug:print 3 *default-log-port* "WARNING: Invalid " (if status "status" "state")
 		     " value \"" (if status state-in status-in) "\", update your validvalues section in megatest.config"))
     (rmt:send-receive 'teststep-set-status! run-id (list run-id test-id teststep-name state-in status-in comment logfile))))
 
 
 (define (rmt:delete-steps-for-test! run-id test-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'delete-steps-for-test! run-id (list run-id test-id)))
 
 (define (rmt:get-steps-for-test run-id test-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-steps-for-test run-id (list run-id test-id)))
 
 (define (rmt:get-steps-info-by-id run-id test-step-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'get-steps-info-by-id #f (list run-id 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)) 
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'read-test-data run-id (list run-id test-id categorypatt)))
 
 (define (rmt:read-test-data-varpatt run-id test-id categorypatt varpatt #!key (work-area #f)) 
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'read-test-data-varpatt run-id (list run-id test-id categorypatt varpatt)))
 
 (define (rmt:get-data-info-by-id run-id test-data-id)
+  (assert (number? run-id) "Run id required.")
    (rmt:send-receive 'get-data-info-by-id #f (list run-id test-data-id)))
 
 (define (rmt:testmeta-add-record testname)
   (rmt:send-receive 'testmeta-add-record #f (list testname)))
 
@@ -917,13 +968,15 @@
 
 (define (rmt:testmeta-update-field test-name fld val)
   (rmt:send-receive 'testmeta-update-field #f (list test-name fld val)))
 
 (define (rmt:test-data-rollup run-id test-id status)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-data-rollup run-id (list run-id test-id status)))
 
 (define (rmt:csv->test-data run-id test-id csvdata)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'csv->test-data run-id (list run-id test-id csvdata)))
 
 ;;======================================================================
 ;;  T A S K S
 ;;======================================================================
@@ -971,10 +1024,11 @@
 
 (define (rmt:archive-register-disk bdisk-name bdisk-path df)
   (rmt:send-receive 'archive-register-disk #f (list bdisk-name bdisk-path df)))
 
 (define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
+  (assert (number? run-id) "Run id required.")
   (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
 
 (define (rmt:test-get-archive-block-info archive-block-id)
   (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))