r5485: *** empty log message ***

diff --git a/classes.lisp b/classes.lisp
index 965491eaf6a32677b1b1e5b0729fc5ac3e183b17..2a49ec1d3f0cd5947e009ad2159cff6ac394554b 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@ x;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: wol -*-
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  July 2003
 ;;;;
-;;;; $Id: classes.lisp,v 1.6 2003/08/08 23:40:13 kevin Exp $
+;;;; $Id: classes.lisp,v 1.7 2003/08/10 07:38:37 kevin Exp $
 ;;;;
 ;;;; This file and Wol are Copyright (c) 2001-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -100,3 +100,6 @@ x;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: wol -*-
   "The output stream for the current request")
 
 (defconstant +length-session-id+ 24)
+
+(defvar *req* nil "Current request")
+(defvar *ent* nil "Current entity")

diff --git a/project.lisp b/project.lisp
index 119c929e00b93096c9462e584bc9c841b29dee7f..d8a4d27d4fcbdc5105d7e6b5106c754972083d06 100644 (file)
--- a/project.lisp
+++ b/project.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  July 2003
 ;;;;
-;;;; $Id: project.lisp,v 1.11 2003/08/10 05:16:52 kevin Exp $
+;;;; $Id: project.lisp,v 1.12 2003/08/10 07:38:37 kevin Exp $
 ;;;;
 ;;;; This file and Wol are Copyright (c) 2001-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -190,6 +190,8 @@
        (redirect-to-location url)))))
 
 (defun dispatch-request (req ent)
+  (setq *req* req)
+  (setq *ent* ent)
   (let ((proj (entity-project ent)))
     (if (is-index-request req ent)
        (redirect-entity (project-index proj) req ent)
@@ -207,8 +209,6 @@
 (defun find-project-for-request (req)
   (maphash (lambda (name project)
             (declare (ignore name))
-            (setq cl-user::p project)
-            (setq cl-user::r req)
             (when (and (eq (project-server project)
                            (or (request-aserve-server req)
                                (request-ml-server req)))

diff --git a/uri.lisp b/uri.lisp
index 1f2e22467d476acc74bef7a907befbeb8a4e6ced..4fe67dd1c0b696d9990283bbacf936d9a5bdf703 100644 (file)
--- a/uri.lisp
+++ b/uri.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  July 2003
 ;;;;
-;;;; $Id: uri.lisp,v 1.8 2003/08/10 05:16:52 kevin Exp $
+;;;; $Id: uri.lisp,v 1.9 2003/08/10 07:38:37 kevin Exp $
 ;;;;
 ;;;; This file and Wol are Copyright (c) 2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -137,6 +137,7 @@
          (prin1-to-string (nreverse output)))
       (push (compress-elem (car list)) output)
       (push (cadr list) output)))
+       
 
 (defun compress-elem (elem)
   "Encode a plist elem"
@@ -178,27 +179,34 @@
       (push (cadr elist) output))))
 
 (defun decompress-elem (elem)
-  (case elem
-    (:N :next-page)
-    (:T :posted)
-    (:O :object-id)
-    (:S :session-id)
-    (:L :lang)
-    (:G :logged)
-    (:C :caller)
-    (:D :db)
-    
-    ;; For posting to lookup-func1
-    (:F :func)
-    (:K :key)
-    (:B :subobjects)
-    (:A :labels)
-    (:E :english-only)
-    (:R :format)
-    
-    (:X :xml)
-    (:P :page)
+  (if (> (length (symbol-name elem)) 1)
+      elem
+    (case (char-upcase (schar (symbol-name elem ) 0))
+      (#\N :next-page)
+      (#\T :posted)
+      (#\O :object-id)
+      (#\S :session-id)
+      (#\L :lang)
+      (#\G :logged)
+      (#\C :caller)
+      (#\D :db)
+      
+      ;; For posting to lookup-func1
+      (#\F :func)
+      (#\K :key)
+      (#\B :subobjects)
+      (#\A :labels)
+      (#\E :english-only)
+      (#\R :format)
+      
+      (#\X :xml)
+      (#\P :page)
+      
+      (otherwise elem))))
+
+
+
+
 
-    (otherwise elem)))