[bknr-cvs] r2227 - in branches/trunk-reorg/bknr: modules web/src web/src/sysclasses web/src/web

bknr at bknr.net bknr at bknr.net
Sat Oct 6 23:08:13 UTC 2007


Author: hhubner
Date: 2007-10-06 19:08:12 -0400 (Sat, 06 Oct 2007)
New Revision: 2227

Modified:
   branches/trunk-reorg/bknr/modules/bknr-modules.asd
   branches/trunk-reorg/bknr/web/src/bknr-web.asd
   branches/trunk-reorg/bknr/web/src/packages.lisp
   branches/trunk-reorg/bknr/web/src/sysclasses/cron.lisp
   branches/trunk-reorg/bknr/web/src/web/authorizer.lisp
   branches/trunk-reorg/bknr/web/src/web/host.lisp
   branches/trunk-reorg/bknr/web/src/web/site.lisp
   branches/trunk-reorg/bknr/web/src/web/web-visitor.lisp
Log:
Make :bknr-web loadable with SBCL.  I'm planning to switch to hunchentoot 
from aserve, but tha has not happened and until then, only the base
components of :bknr-web are in the compile.  I'm using the bknr.user
now.


Modified: branches/trunk-reorg/bknr/modules/bknr-modules.asd
===================================================================
--- branches/trunk-reorg/bknr/modules/bknr-modules.asd	2007-10-06 23:06:39 UTC (rev 2226)
+++ branches/trunk-reorg/bknr/modules/bknr-modules.asd	2007-10-06 23:08:12 UTC (rev 2227)
@@ -25,10 +25,7 @@
 		 :bknr-utils
 		 :puri
 		 :stem
-		 #+(or) :mime
 		 :bknr
-		 :klammerscript
-		 #+(not allegro)
 		 :acl-compat)
 
     :components ((:file "packages")

Modified: branches/trunk-reorg/bknr/web/src/bknr-web.asd
===================================================================
--- branches/trunk-reorg/bknr/web/src/bknr-web.asd	2007-10-06 23:06:39 UTC (rev 2226)
+++ branches/trunk-reorg/bknr/web/src/bknr-web.asd	2007-10-06 23:08:12 UTC (rev 2227)
@@ -10,7 +10,7 @@
   (make-pathname :name nil :type nil :version nil
 		 :defaults (parse-namestring *load-truename*)))
 
-(defsystem :bknr
+(defsystem :bknr-web
     :name "Baikonour - Base modules"
     :author "Hans Huebner <hans at huebner.org>"
     :author "Manuel Odendahl <manuel at bl0rg.net>"
@@ -22,34 +22,25 @@
     :depends-on (:cl-interpol
 		 :cl-ppcre
 		 :cl-gd
-		 :aserve
-		 ;:net.post-office
+		 :kmrcl
 		 :md5
 		 :cxml
 		 :unit-test
 		 :bknr-utils
 		 :bknr-xml
+		 :hunchentoot
+		 :xhtmlgen
 		 :puri
-		 ;:stem
-		 ;:mime
-		 :klammerscript
 		 :bknr-datastore
-		 :bknr-data-impex
-		 :kmrcl
-		 :iconv
-		 #+(not allegro)
-		 :acl-compat)
+		 :bknr-data-impex)
 
     :components ((:file "packages")
-		 
-		 (:module "xhtmlgen" :components ((:file "xhtmlgen"))
-			  :depends-on ("packages"))
 	       
 		 (:module "sysclasses" :components ((:file "event")
 						    (:file "user" :depends-on ("event"))
 						    (:file "cron")
 						    (:file "sysparam"))
-			  :depends-on ("xhtmlgen"))
+			  :depends-on ("packages"))
 
 		 (:module "htmlize" :components ((:file "hyperspec")
 						 (:file "htmlize"
@@ -68,6 +59,7 @@
 						    :depends-on ("parse-xml" "rss")))
 			  :depends-on ("packages"))
 
+		 #+notyet
 		 (:module "web" :components ((:file "site")
 					     ;; data
 					     (:file "host")
@@ -116,8 +108,9 @@
 								 "templates"
 								 "site"
 								 "web-utils")))
-			  :depends-on ("sysclasses" "packages" "xhtmlgen" "rss"))
+			  :depends-on ("sysclasses" "packages" "rss"))
 
+		 #+notyet
 		 (:module "images" :components ((:file "image")
 						
 						(:file "image-tags" :depends-on ("image"))

Modified: branches/trunk-reorg/bknr/web/src/packages.lisp
===================================================================
--- branches/trunk-reorg/bknr/web/src/packages.lisp	2007-10-06 23:06:39 UTC (rev 2226)
+++ branches/trunk-reorg/bknr/web/src/packages.lisp	2007-10-06 23:08:12 UTC (rev 2227)
@@ -175,12 +175,11 @@
 	:cl-gd
 	:cl-interpol
 	:cl-ppcre
-	:net.aserve
+	:hunchentoot
 	:cxml-xmls
 	:xhtml-generator
 	:puri
 	:md5
-	:js
 	:bknr.datastore
 	:bknr.indices
 	:bknr.impex
@@ -189,7 +188,6 @@
 	:bknr.events
 	:bknr.user)
   (:shadowing-import-from :cl-interpol #:quote-meta-chars)
-  (:import-from :net.html.generator #:*html-stream*)
   (:export #:*req*
 	   #:*ent*
 	   #:*user*
@@ -400,7 +398,7 @@
 	:cl-gd
 	:cl-interpol
 	:cl-ppcre
-	:net.aserve
+	:hunchentoot
 	:puri
 	:xhtml-generator
 	:bknr.rss
@@ -410,7 +408,6 @@
 	:bknr.utils
 	:bknr.user)
   (:shadowing-import-from :cl-interpol #:quote-meta-chars)
-  (:import-from :net.html.generator #:*html-stream*)
   (:export #:imageproc
 	   #:define-imageproc-handler
 	   #:image-handler			; plain images only

Modified: branches/trunk-reorg/bknr/web/src/sysclasses/cron.lisp
===================================================================
--- branches/trunk-reorg/bknr/web/src/sysclasses/cron.lisp	2007-10-06 23:06:39 UTC (rev 2226)
+++ branches/trunk-reorg/bknr/web/src/sysclasses/cron.lisp	2007-10-06 23:08:12 UTC (rev 2227)
@@ -10,24 +10,24 @@
        (>= hour 0)
        (< hour 24)))
 
-(defconstant +day-list+ '(:monday :tuesday :wednesday :thursday :friday :saturday :sunday))
+(defparameter *day-list* '(:monday :tuesday :wednesday :thursday :friday :saturday :sunday))
 
 (defun day-p (day)
   (or (and (numberp day)
 	   (>= day 1)
 	   (<= day 7))
       (and (symbolp day)
-	   (member day +day-list+))))
+	   (member day *day-list*))))
 
 (defun day-to-number (day)
   (if (numberp day)
       day
-      (let ((num (position day +day-list+)))
+      (let ((num (position day *day-list*)))
 	(if num
 	    (1+ num)
 	    (error "Could not find day in day-list")))))
 
-(defconstant +month-list+ '(:january :february :march :april :may :june :july
+(defparameter *month-list* '(:january :february :march :april :may :june :july
 			    :august :september :october :november :december))
 
 (defun month-p (month)
@@ -35,12 +35,12 @@
 	   (>= month 1)
 	   (<= month 12))
       (and (symbolp month)
-	   (member month +month-list+))))
+	   (member month *month-list*))))
 
 (defun month-to-number (month)
   (if (numberp month)
       month
-      (let ((num (position month +month-list+)))
+      (let ((num (position month *month-list*)))
 	(if num
 	    (1+ num)
 	    (error "Could not find month in month-list")))))

Modified: branches/trunk-reorg/bknr/web/src/web/authorizer.lisp
===================================================================
--- branches/trunk-reorg/bknr/web/src/web/authorizer.lisp	2007-10-06 23:06:39 UTC (rev 2226)
+++ branches/trunk-reorg/bknr/web/src/web/authorizer.lisp	2007-10-06 23:08:12 UTC (rev 2227)
@@ -3,6 +3,7 @@
 (defclass bknr-authorizer ()
   ())
 
+#+cmu
 (defmethod http-request-remote-host ((req http-request))
   (let ((remote-host (socket:remote-host (request-socket req)))
 	(forwarded-for (regex-replace

Modified: branches/trunk-reorg/bknr/web/src/web/host.lisp
===================================================================
--- branches/trunk-reorg/bknr/web/src/web/host.lisp	2007-10-06 23:06:39 UTC (rev 2226)
+++ branches/trunk-reorg/bknr/web/src/web/host.lisp	2007-10-06 23:08:12 UTC (rev 2227)
@@ -46,11 +46,11 @@
     (host-ip-address host)))
 
 (defmethod host-ipaddr ((host host))
-  (socket:dotted-to-ipaddr (host-ip-address host)))
+  (kmrcl::dotted-to-ipaddr (host-ip-address host)))
 
 (defun find-host (&key ip-address create ipaddr)
   (when ipaddr
-    (setf ip-address (socket:ipaddr-to-dotted ipaddr)))
+    (setf ip-address (kmrcl::ipaddr-to-dotted ipaddr)))
   (or (host-with-ipaddress ip-address)
       (and create
 	   (make-object 'host :ip-address ip-address))))

Modified: branches/trunk-reorg/bknr/web/src/web/site.lisp
===================================================================
--- branches/trunk-reorg/bknr/web/src/web/site.lisp	2007-10-06 23:06:39 UTC (rev 2226)
+++ branches/trunk-reorg/bknr/web/src/web/site.lisp	2007-10-06 23:08:12 UTC (rev 2227)
@@ -6,5 +6,5 @@
 (defparameter *thumbnail-max-height* 54)
 
 ;; default billboard to show on home page
-(defconstant *default-billboard* "main")
+(defparameter *default-billboard* "main")
 

Modified: branches/trunk-reorg/bknr/web/src/web/web-visitor.lisp
===================================================================
--- branches/trunk-reorg/bknr/web/src/web/web-visitor.lisp	2007-10-06 23:06:39 UTC (rev 2226)
+++ branches/trunk-reorg/bknr/web/src/web/web-visitor.lisp	2007-10-06 23:08:12 UTC (rev 2227)
@@ -24,7 +24,7 @@
     (when (web-visitor-event-host event)
       (format stream " from ~a [~a]"
 	      (host-name (web-visitor-event-host event))
-	      (host-ip-address (web-visitor-event-host event))))))
+	      (host-ip-address (web-visitor-event-host event)))))
   event)
 
 #+(or)




More information about the Bknr-cvs mailing list