debugging galore

[rrq/hourglass.git] / command.lsp

diff --git a/command.lsp b/command.lsp
index 8751fc3082e4c5de8571b94d06f5787d22e62c4d..6045386816eae39d3657562acc8f869e1f85b0d1 100644 (file)
--- a/command.lsp
+++ b/command.lsp
@@ -2,45 +2,7 @@
 # This script is intended as main script for packnl embedding, it
 # dispatches to the command of the first argument.
 
-(context 'MAIN:SITE)
-
-(define (set-int K V) (set K (int V 0 10)))
-
-(define (set-ints K V)
-  (map (curry set-int K) (clean empty? (parse V "\\s*,?\\s*" 0))))
-
-(define (set-list K V)
-  (map (curry set K) (clean empty? (parse V "\\s*,?\\s*" 0))))
-
-(constant
- 'FILE "hourglass.conf"
- 'KEYS '(
-         ("libc" set)
-         ("listener.ports" set-ints)
-         ("listener.ip" set)
-         ("listener.activity.dir" set)
-         ("control.action" set)
-         ("control.dat" set)
-         ("control.net" set)
-         ("control.extra.dat" set)
-         ("control.usage.dat" set)
-         ("control.usage.tmp" set)
-
-         ("wui.port" set-int)
-         ("wui.roles" set)
-         ("wui.passwd" set)
-         )
- )
-
-(define (setting LINE)
-  (when (regex "^\\s([^;#][^=]*)=(.*)" LINE 0)
-    (let ((KV (map trim (list $1 $2))))
-      (if (lookup (KV 0) KEYS) (apply $it (list (sym (KV 0)) (KV 1)))))))
-
-(map setting (parse (or (read-file FILE) "") "\n"))
-
-####################
-(context MAIN)
+(load "siteconfig.lsp")
 
 (if (exists file? (list (main-args 1)
                         (string (main-args 1) ".lsp")))