Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -521,23 +521,23 @@ (open-input-string csvdata) '((strip-leading-whitespace? #t) (strip-trailing-whitespace? #t)) )))) ;; (csv->list csvdata))) (for-each (lambda (csvrow) - (let* ((padded-row (take (append csvrow '(#f #f #f #f #f #f #f #f)) 8)) + (let* ((padded-row (take (append csvrow (list #f #f #f #f #f #f #f #f)) 8)) (category (list-ref padded-row 0)) (variable (list-ref padded-row 1)) (value (any->number-if-possible (list-ref padded-row 2))) (expected (any->number-if-possible (list-ref padded-row 3))) (tol (any->number-if-possible (list-ref padded-row 4))) ;; >, <, >=, <=, or a number (units (list-ref padded-row 5)) (comment (list-ref padded-row 6)) (status (let ((s (list-ref padded-row 7))) (if (and (string? s)(or (string-match (regexp "^\\s*$") s) - (string-match (regexp "^n/a$")))) + (string-match (regexp "^n/a$") s))) #f - status)))) ;; if specified on the input then use, else calculate + s)))) ;; if specified on the input then use, else calculate ;; look up expected,tol,units from previous best fit test if they are all either #f or '' (if (and (or (not expected)(equal? expected "")) (or (not tol) (equal? expected "")) (or (not units) (equal? expected ""))) (let-values (((new-expected new-tol new-units)(db:get-prev-tol-for-test db test-id category variable)))