X-Git-Url: http://git.kpe.io/?p=wol.git;a=blobdiff_plain;f=classes.lisp;h=90b868b9e2379fddbc9e046c830e4ddfbc03b9db;hp=17f12eb267e46ef9ee9ba652276cbf13bd0ace02;hb=115593575b49ab252692a959380e94707e385de3;hpb=d91ff3b4d9cdcae003420c04609ea736161c7e65

diff --git a/classes.lisp b/classes.lisp
index 17f12eb..90b868b 100644
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  July 2003
 ;;;;
-;;;; $Id: classes.lisp,v 1.3 2003/07/18 21:34:18 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file and Wol are Copyright (c) 2001-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -29,7 +29,7 @@
    (lifetime :initarg :lifetime :initform nil
 	     :accessor websession-lifetime)
    (data :initform nil :accessor websession-data)
-   (method :initarg :method :accessor websession-method)
+   (method :initarg :method :accessor websession-method :initform nil)
    (variables :initform (make-hash-table :test 'equal)
 	      :accessor websession-variables)))
    
@@ -55,6 +55,9 @@
 (defclass http-request ()
   ((method  :initarg :method :accessor request-method)
    (uri  :initarg :uri :accessor request-uri)
+   (decoded-uri-path :initarg :decoded-uri-path
+		     :accessor request-decoded-uri-path)
+   (raw-request :initarg :raw-request :accessor request-raw-request)
    (raw-uri :initarg :raw-uri :accessor request-raw-uri)
    (protocol :initarg :protocol :reader request-protocol)
    (protocol-string :initarg :protocol-string :reader request-protocol-string)
@@ -62,13 +65,15 @@
    (ml-server :initarg :ml-server :reader request-ml-server)
    (aserve-server :initarg :aserve-server :reader request-aserve-server)
    (host :initarg :host :accessor request-host)
-   (vhost :initarg :vhost :accessor request-vhost)
+   (desired-query :initform nil :accessor request-desired-query
+		  :documentation "type of query alist requested")
    (posted-content :initarg :posted-content :accessor request-posted-content)
    (headers :initarg :headers :accessor request-headers)
    (page :initarg :page :initform nil :accessor request-page)
+   (url-plist :initarg :url-plist :initform nil :accessor request-url-plist)
    (plist :initarg :plist :initform nil :accessor request-plist)
-   (next-plists :initarg :next-plists :initform nil 
-		:accessor request-next-plists)
+   (url-next-plists :initarg :url-next-plists :initform nil 
+		:accessor request-url-next-plists)
    (uri-query :initarg :uri-query :initform nil 
 		:accessor request-uri-query)
    (query-alist :initarg :query-alist :initform nil 
@@ -84,13 +89,18 @@
 
 (defvar *active-projects* (make-hash-table :test 'equal))
 
-(defvar +asp-header+ "lsp")
-(defvar +full-asp-header+ "/lsp")
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defvar +plist-header+ "sdata"
+    "string that starts an encoded plist"))
 
-(defvar +plist-header+ "/sdata"
-  "string that starts an encoded plist")
+(defconstant +plist-header-length+ (length +plist-header+))
 
 (defparameter *wol-version* '(0 1 0))
 
 (defvar *wol-stream* nil
   "The output stream for the current request")
+
+(defconstant +length-session-id+ 24)
+
+(defvar *req* nil "Current request")
+(defvar *ent* nil "Current entity")