X-Git-Url: http://git.pond.sub.org/?p=eow;a=blobdiff_plain;f=web.lisp;h=06f483b8a323637c385deb7e24584a3871eca4d4;hp=b3a8a75790918ac6ec92fd15a636532f77ddd629;hb=fc636ef0b61e6018deba9e31e2f9ab3efc381a1e;hpb=bc971edf4284f7d16d94659f6e21a9127a419d56

diff --git a/web.lisp b/web.lisp
index b3a8a75..06f483b 100644
--- a/web.lisp
+++ b/web.lisp
@@ -50,7 +50,7 @@
     session))
 
 (defgeneric send (session string))
-(defgeneric prompt (session minutes btus))
+(defgeneric prompt (session string))
 (defgeneric data (session message))
 
 (defvar *empire-session*)
@@ -70,8 +70,8 @@
   "Push a javascript update fragment to the client."
   (locked-queue:enqueue (update-queue s) string))
 
-(defmethod prompt ((s session) minutes btus)
-  (send s (format nil "prompt(~a,~a);~%" minutes btus)))
+(defmethod prompt ((s session) p)
+  (send s (parenscript:ps* `(prompt ,p))))
 
 (defmethod data ((s session) message)
   (send s (parenscript:ps* `(msg ,message))))
@@ -79,16 +79,18 @@
 ;; destination of login-form
 (defun login-action ()
   (handler-case
-      (let ((session (make-session (post-parameter "username")
-				   (post-parameter "password"))))
+      (let* ((user (post-parameter "username"))
+	     (pass (post-parameter "password"))
+	     (session (make-session user pass)))
 	(setf (session-value 'session) session)
+	(empire-log:info "~a: User ~a logging in." session user)
 	(redirect +root-url+))
     (usocket:connection-refused-error (e)
       (format nil "Connection error: ~a~%" e))))
 
 (defun command-action ()
   (with-session
-      (empire:send-message (connection *empire-session*) (get-parameter "q"))))
+      (empire:command (connection *empire-session*) (get-parameter "q"))))
 
 (defun root-page ()
   (with-session
@@ -107,5 +109,6 @@
 
 
 (defun start ()
+  (empire-log:info "Startup")
   (pushnew 'dispatch *dispatch-table* :test #'eq))