Index: margs.scm ================================================================== --- margs.scm +++ margs.scm @@ -23,10 +23,20 @@ (define (args:get-arg arg . default) (if (null? default) (hash-table-ref/default args:arg-hash arg #f) (hash-table-ref/default args:arg-hash arg (car default)))) + +;; get an arg as a number +(define (args:get-arg-number arg . default) + (let* ((val-str (args:get-arg arg)) + (val (if val-str (string->number val-str) #f))) + (if val + val + (if (null? default) + #f + default)))) (define (args:any? . args) (not (null? (filter (lambda (x) x) (map args:get-arg args))))) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -25,10 +25,12 @@ (declare (uses common)) ;; (declare (uses megatest-version)) (declare (uses margs)) (declare (uses commonmod)) (declare (uses commonmod.import)) +(declare (uses debugprint)) +(declare (uses debugprint.import)) (declare (uses runs)) (declare (uses launch)) (declare (uses server)) (declare (uses client)) (declare (uses tests)) @@ -43,27 +45,28 @@ (declare (uses api)) (declare (uses tasks)) ;; only used for debugging. (declare (uses env)) (declare (uses diff-report)) (declare (uses db)) +(declare (uses dbfile)) +(declare (uses dbfile.import)) (declare (uses dbmod)) (declare (uses dbmod.import)) -(declare (uses dbfile)) -(declare (uses dbfile.import)) -(declare (uses tcp-transport)) +(declare (uses tcp-transportmod)) ;; (declare (uses debugprint)) ;; (declare (uses debugprint.import)) ;; (declare (uses mtargs)) ;; (declare (uses mtargs.import)) ;; (declare (uses ftail)) ;; (import ftail) -(import dbmod +(import debugprint + dbmod commonmod dbfile - tcp-transport) + tcp-transportmod) (define *db* #f) ;; this is only for the repl, do not use in general!!!! (include "common_records.scm") (include "key_records.scm") Index: mtargs/mtargs.scm ================================================================== --- mtargs/mtargs.scm +++ mtargs/mtargs.scm @@ -18,10 +18,11 @@ (module mtargs ( arg-hash get-arg + get-arg-number get-arg-from get-args usage print-args any-defined? @@ -42,10 +43,20 @@ (define (get-arg arg . default) (if (null? default) (hash-table-ref/default arg-hash arg #f) (hash-table-ref/default arg-hash arg (car default)))) + +;; get an arg as a number +(define (get-arg-number arg . default) + (let* ((val-str (get-arg arg)) + (val (if val-str (string->number val-str) #f))) + (if val + val + (if (null? default) + #f + default)))) (define (any-defined? . args) (not (null? (filter (lambda (x) x) (map get-arg args))))) Index: tcp-transportmod.scm ================================================================== --- tcp-transportmod.scm +++ tcp-transportmod.scm @@ -154,16 +154,10 @@ (tt:keep-running ttdat dbfname)) (begin (debug:print 0 *default-log-port* "INFO: found server(s) already running for db "dbfname", "(string-intersperse servers ",")" Exiting.") (exit))))) -((make-tcp-server - (tcp-listen 6504) - (lambda () - (write-line (seconds->string (current-seconds))))) - #t) - ;; find a port and start tcp-server ;; (define (tt:start-tcp-server ttdat) (setup-listener ttdat) (let* ((socket (tt-srv-socket ttdat))