r5484: *** empty log message ***

[wol.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index 70f01b33592981b0c4719ce95d0c52dd01f31404..965491eaf6a32677b1b1e5b0729fc5ac3e183b17 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: wol -*-
+x;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: wol -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  July 2003
 ;;;;
-;;;; $Id: classes.lisp,v 1.2 2003/07/16 16:40:35 kevin Exp $
+;;;; $Id: classes.lisp,v 1.6 2003/08/08 23:40:13 kevin Exp $
 ;;;;
 ;;;; 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)))
    
@@ -43,24 +43,32 @@
          :accessor project-index)
    (server :initarg :server :initform nil :accessor project-server)
    (session-master :initform (make-instance 'session-master)
-                  :accessor session-master)))
+                  :accessor session-master)
+   (connector :initarg :connector :accessor project-connector)))
 
 (defclass entity ()
-  ((project :initarg :project :accessor entity-project))
-  )
+  ((project :initarg :project :accessor entity-project)
+   (aserve-entity :initarg :aserve-entity :initform nil
+                 :accessor entity-aserve-entity)))
+
 
 (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)
    (socket :initarg :socket :reader request-socket)
    (ml-server :initarg :ml-server :reader request-ml-server)
-   (vhost :initarg :vhost :accessor request-vhost)
+   (aserve-server :initarg :aserve-server :reader request-aserve-server)
+   (host :initarg :host :accessor request-host)
+   (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)
-   (project :initarg :project :accessor project)
    (page :initarg :page :initform nil :accessor request-page)
    (plist :initarg :plist :initform nil :accessor request-plist)
    (next-plists :initarg :next-plists :initform nil 
@@ -71,6 +79,8 @@
                :accessor request-query-alist)
    (session :initarg :session :initform nil
            :accessor websession-from-req)
+   (aserve-request :initarg :aserve-request :initform nil
+                  :accessor aserve-request)
    ))
 
 (defvar *reap-interval* 300)
@@ -84,4 +94,9 @@
 (defvar +plist-header+ "/sdata"
   "string that starts an encoded plist")
 
-(defvar *wol-version* "0.1.0")
+(defparameter *wol-version* '(0 1 0))
+
+(defvar *wol-stream* nil
+  "The output stream for the current request")
+
+(defconstant +length-session-id+ 24)