[bknr-cvs] hans changed trunk/bknr/web/src/

[BKNR Commits]

Revision: 4308
Author: hans
URL: http://bknr.net/trac/changeset/4308

Hunchentoot 1.0.0 changes (not complete)
U   trunk/bknr/web/src/packages.lisp
U   trunk/bknr/web/src/web/handlers.lisp
U   trunk/bknr/web/src/web/web-macros.lisp

Modified: trunk/bknr/web/src/packages.lisp
===================================================================
--- trunk/bknr/web/src/packages.lisp	2009-02-23 11:25:25 UTC (rev 4307)
+++ trunk/bknr/web/src/packages.lisp	2009-02-23 11:26:45 UTC (rev 4308)
@@ -256,6 +256,7 @@
            #:*template-dtd-catalog*
 
 	   ;; handlers
+           #:bknr-dispatch
 	   #:parse-handler-url
 	   #:*website*
 	   #:website

Modified: trunk/bknr/web/src/web/handlers.lisp
===================================================================
--- trunk/bknr/web/src/web/handlers.lisp	2009-02-23 11:25:25 UTC (rev 4307)
+++ trunk/bknr/web/src/web/handlers.lisp	2009-02-23 11:26:45 UTC (rev 4308)
@@ -358,13 +358,13 @@
       (handler
        (cond
          ((authorized-p handler)
-          (curry #'invoke-handler handler))
+          (invoke-handler handler))
          (t
           (setf (session-value :login-redirect-uri)
                 (redirect-uri (parse-uri (script-name*))))
           (redirect "/login"))))
       (t
-       'error-404))))
+       (error-404)))))
 
 (defmethod publish-handler ((website website) (handler page-handler))
   (setf *handlers* (append *handlers* (list handler))))
@@ -487,7 +487,7 @@
                      (filenames (if (directory-handler-filename-separator handler)
                                     (mapcar #'pathname (split (directory-handler-filename-separator handler)
                                                               pathnames-argument))
-                                    pathnames-argument))
+                                    (list pathnames-argument)))
                      (types (mapcar #'pathname-type filenames)))
                 (unless (every #'equal types (cdr types))
                   (error 'non-matching-filetypes-in-combination :pathnames-argument pathnames-argument))
@@ -694,7 +694,7 @@
 
 (defmethod handle-object ((handler blob-handler) (blob blob))
   (with-http-response (:content-type (blob-mime-type blob))
-    (setf (content-length) (blob-size blob))
+    (setf (content-length*) (blob-size blob))
     (let ((stream (send-headers)))
       (blob-to-stream blob stream))))
 
@@ -746,7 +746,7 @@
 	  (:princ-safe error)))))))
 
 (defun show-page-with-error-handlers (fn &key (response +http-ok+) title)
-  (setf (return-code) response)
+  (setf (return-code*) response)
   (with-http-response (:content-type "text/html; charset=UTF-8" :response response)
     (with-http-body ()
       (website-show-page *website* fn title))))

Modified: trunk/bknr/web/src/web/web-macros.lisp
===================================================================
--- trunk/bknr/web/src/web/web-macros.lisp	2009-02-23 11:25:25 UTC (rev 4307)
+++ trunk/bknr/web/src/web/web-macros.lisp	2009-02-23 11:26:45 UTC (rev 4308)
@@ -56,8 +56,8 @@
 
 (defmacro with-http-response ((&key (content-type "text/html") (response +http-ok+)) &body body)
   `(progn
-     (setf (content-type) ,content-type)
-     (setf (return-code) ,response)
+     (setf (content-type*) ,content-type)
+     (setf (return-code*) ,response)
      , at body))
 
 (defmacro with-http-body ((&key external-format) &body body)