r5318: *** empty log message ***

[cl-modlisp.git] / base.lisp

diff --git a/base.lisp b/base.lisp
index 4ae7c6d5009c97cbc912d208e639f6fa5bd400a0..ebb2ece37c8932ef451c4a0d204444babd126e6c 100644 (file)
--- a/base.lisp
+++ b/base.lisp
@@ -7,48 +7,58 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.12 2003/07/11 07:00:57 kevin Exp $
+;;;; $Id: base.lisp,v 1.13 2003/07/16 20:40:43 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
 
 (defun modlisp-start (&key (port +default-modlisp-port+)
-                     (processor 'demo-modlisp-command-processor)
-                     (processor-args nil)
-                     (catch-errors t)
-                     timeout
-                     number-fixed-workers
-                     remote-host-checker)
-  (let ((listener (make-instance 'listener :port port
-                                :base-name "modlisp"                    
-                                :function 'modlisp-command-issuer
-                                :function-args (cons processor processor-args)
-                                :format :text
-                                :wait nil
-                                :catch-errors catch-errors
-                                :timeout timeout
-                                :number-fixed-workers number-fixed-workers
-                                :remote-host-checker remote-host-checker)))
-    (init/listener listener :start)))
+                          (processor 'demo-modlisp-command-processor)
+                          (processor-args nil)
+                          (catch-errors t)
+                          timeout
+                          number-fixed-workers
+                          remote-host-checker)
+  (let* ((server (make-instance 'ml-server
+                  :processor processor
+                  :processor-args processor-args
+                  :port port))
+        (listener (make-instance 'listener :port port
+                                 :base-name "modlisp"                   
+                                 :function 'modlisp-command-issuer
+                                 :function-args (list server)
+                                 :format :text
+                                 :wait nil
+                                 :catch-errors catch-errors
+                                 :timeout timeout
+                                 :number-fixed-workers number-fixed-workers
+                                 :remote-host-checker remote-host-checker)))
+    (setf (listener server) listener)
+    (init/listener listener :start)
+    (setf *ml-server* server)
+    server))
 
 
-(defun modlisp-stop (listener)
-  (init/listener listener :stop))
+(defun modlisp-stop (server)
+  (init/listener (listener server) :stop)
+  (setf (listener server) nil)
+  server)
 
 (defun modlisp-stop-all ()
   (stop-all/listener))
 
 ;; Internal functions
 
-(defun modlisp-command-issuer (*modlisp-socket* processor &rest args)
+(defun modlisp-command-issuer (*modlisp-socket* server)
   "generates commands from modlisp, issues commands to processor-fun"
   (unwind-protect
        (progn
         (let ((*number-worker-requests* 0)
-              (*close-modlisp-socket* t))
+              (*close-modlisp-socket* t)
+              (*ml-server* server))
           (do ((command (read-modlisp-command) (read-modlisp-command)))
               ((null command))
-            (apply processor command args)
+            (apply (processor server) command (processor-args server))
             (finish-output *modlisp-socket*)
             (incf *number-worker-requests*)
             (incf *number-server-requests*)
@@ -58,24 +68,26 @@
   
 (defun header-value (header key)
   "Returns the value of a modlisp header"
-  (cdr (assoc key header :test #'string=)))
+  (cdr (assoc key header :test #'eq)))
 
 (defun read-modlisp-command ()
   (ignore-errors
     (let* ((header (read-modlisp-header))
-          (content-length (header-value header "content-length"))
+          (content-length (header-value header :content-length))
           (content (when content-length 
                      (make-string
                       (parse-integer content-length :junk-allowed t)))))
-     (when content
-       (read-sequence content *modlisp-socket*)
-       (push (cons "posted-content" content) header))
-     header)))
+         (when content
+           (read-sequence content *modlisp-socket*)
+           (push (cons :posted-content content) header))
+         header)))
+
 
 (defun read-modlisp-line ()
   (kmrcl:string-right-trim-one-char
    #\return
-   (read-line *modlisp-socket* nil nil)))
+   (read-line *modlisp-socket* nil nil)))      
+
 
 (defun read-modlisp-header ()
   (loop for key = (read-modlisp-line)
@@ -83,10 +95,10 @@
                 (string-not-equal key "end")
                 (> (length key) 1))
       for value = (read-modlisp-line)
-      collect (cons key value)))
+      collect (cons (ensure-keyword key) value)))
 
 (defun write-header-line (key value)
-  (write-string key *modlisp-socket*)
+  (write-string (string key) *modlisp-socket*)
   (write-char #\NewLine *modlisp-socket*)
   (write-string value *modlisp-socket*)
   (write-char #\NewLine *modlisp-socket*))