X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=manager%2Fusage.lsp;h=3969a3e50ced948fcfdb56e772b95adab91d8c6b;hb=36d9d2fd887f26b87c5d20527fcb741540a2aae1;hp=c5de943e49f03624ac421bd0bc46e6992b94c25d;hpb=10d5ff6dcc2a35e5d690216edc16950e4fb022a9;p=rrq%2Fhourglass.git diff --git a/manager/usage.lsp b/manager/usage.lsp index c5de943..3969a3e 100644 --- a/manager/usage.lsp +++ b/manager/usage.lsp @@ -1,20 +1,21 @@ (load "expand-string.lsp") +(constant + 'USAGEFILE SITE:control.usage.dat + 'EXTRAFILE SITE:control.extra.dat + ) + (when (= (env "REQUEST_METHOD") "POST") (load "usage-extra.lsp") ) -(define (get-remote-user) REMOTE_USER) - (constant - 'ADMIN (member REMOTE_USER '("ralph" "lin")) - 'USAGE (read-expr (read-file "usage.dat")) - 'extra-options '(0 10 30 60) - 'EXTRAFILE "control-extra.dat" + 'USAGE (read-expr (read-file USAGEFILE)) 'EXTRATM (file-info EXTRAFILE 6) - 'TM (date-value) 'EXTRA (and (regex "([0-9]+) ([0-9]+)" (or (read-file EXTRAFILE) "") 0) (list (int $1 0 10) (int $2 0 10))) + 'TM (date-value) + 'extra-options '(0 10 30 60) ) (define (tm2time tm)