X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=manager%2Fcontrols.lsp;h=10153dfdf5eb65f4e25bdcedf3d0990180a94d13;hb=f74fef02b362f72f28621e6d5d099f5523587666;hp=b4779aee24a9e5684483b8c387e04702c1c4803c;hpb=8e3c55b65d2acf7ed3ab2f9eeaffcc5b9d6d117f;p=rrq%2Fhourglass.git

diff --git a/manager/controls.lsp b/manager/controls.lsp
index b4779ae..10153df 100644
--- a/manager/controls.lsp
+++ b/manager/controls.lsp
@@ -1,7 +1,11 @@
-; Load and present ../controls.dat
+; Load and present control.dat
 
 (load "expand-string.lsp")
 
+(constant
+ 'CONTROLFILE SITE:control.dat
+ )
+
 (setf UPDATE "")
 
 (when (= (env "REQUEST_METHOD") "POST")
@@ -9,18 +13,15 @@
   )
 
 (constant
- 'CONTROLFILE "../control.dat"
  'CONTROL (read-expr (read-file CONTROLFILE))
  'GAP (or (lookup 'gap CONTROL) 5)
  'CLIP (or (lookup 'clip CONTROL) 5)
- 'INCL (or (lookup control CONTROL) "ipset-control.lsp")
  'TIMES (map (fn (n) (or (assoc n CONTROL) '(1 timed (7 0) (3 0) (19 0))))
              (sequence 1 7))
  )
 
 (setf
  DAYS '(0 "Mon" "Tue" "Wed" "Thu" "Fri" "Sat" "Sun")
- incl-options '("ipset-control.lsp")
  gap-options '(0 1 2 5 10 15 30)
  clip-options '(0 200 500 800 1000 1200 1500 2000)
  mode-options '("opened" "timed" "closed")
@@ -35,5 +36,6 @@
 (for (h 1 8) (dolist (m '(0 30))
                (push (format "%02d:%02d" h m) limit-options -1)))
 
+(println "Status 200 OK\nContent-Type: text/html\n\n")
 (println (expand-file "tmpl/controls-form.html" ))
 (exit 0)