From: Gerd Flaig <gefla@gefla-mac-zrh>
Date: Sun, 21 Dec 2008 14:28:12 +0000 (+0100)
Subject: *session* -> *empire-session* (clash with hunchentoot:*session*)
X-Git-Url: http://git.pond.sub.org/?p=eow;a=commitdiff_plain;h=7551e93f5c11d9fa62406085dc87eeb87fee9ba6

*session* -> *empire-session* (clash with hunchentoot:*session*)
---

diff --git a/web.lisp b/web.lisp
index 96aca61..ac6a94a 100644
--- a/web.lisp
+++ b/web.lisp
@@ -53,12 +53,12 @@
 (defgeneric prompt (session minutes btus))
 (defgeneric data (session message))
 
-(defvar *session*)
+(defvar *empire-session*)
 
 (defun update ()
   "Send stream of updates to client"
   (with-session
-    (locked-queue:dequeue (update-queue *session*))))
+    (locked-queue:dequeue (update-queue *empire-session*))))
 
 (defmethod send ((s session) string)
   "Push a javascript update fragment to the client."
@@ -71,8 +71,8 @@
   (send s (parenscript:ps* `(msg ,message))))
 
 (defmacro with-session (&body body)
-  `(let ((*session* (session-value 'session)))
-     (if *session*
+  `(let ((*empire-session* (session-value 'session)))
+     (if *empire-session*
 	 (progn ,@body)
 	 (redirect +login-page+))))
 
@@ -88,7 +88,7 @@
 
 (defun command-action ()
   (with-session
-      (empire:send-message (connection *session*) (get-parameter "q"))))
+      (empire:send-message (connection *empire-session*) (get-parameter "q"))))
 
 (defun root-page ()
   (with-session