- clhp-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[clhp-cvs] CVS update: clhp/BUGS
by Anthony Ventimiglia 21 Oct '03

21 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv18113 Modified Files: BUGS Log Message: Found a bug where only one variable can be bound in a LET form. Date: Tue Oct 21 14:48:53 2003 Author: aventimiglia Index: clhp/BUGS diff -u clhp/BUGS:1.1 clhp/BUGS:1.2 --- clhp/BUGS:1.1 Wed Oct 1 10:01:47 2003 +++ clhp/BUGS Tue Oct 21 14:48:52 2003 @@ -1,2 +1,10 @@ -$Id: BUGS,v 1.1 2003/10/01 14:01:47 aventimiglia Exp $ -*- outline -*- +$Id: BUGS,v 1.2 2003/10/21 18:48:52 aventimiglia Exp $ -*- outline -*- +* Let forms are not evaluated properly. + It seems that putting more than one declaration in a let binding + does not work: in other words: + + (let ((x 0)) x) Works while: + (let ((x 0) (y 1)) (+ x y)) fails. + + I'll have to dissect soon.

1 0

[clhp-cvs] CVS update: clhp/cgi.lisp clhp/ChangeLog
by Anthony Ventimiglia 21 Oct '03

21 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv5152 Modified Files: cgi.lisp ChangeLog Log Message: (*QUERY-VARS*): Fixed so test is #'equal, which will work properly with strings Date: Tue Oct 21 12:57:27 2003 Author: aventimiglia Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.13 clhp/cgi.lisp:1.14 --- clhp/cgi.lisp:1.13 Tue Oct 21 00:16:58 2003 +++ clhp/cgi.lisp Tue Oct 21 12:57:27 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.13 2003/10/21 04:16:58 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.14 2003/10/21 16:57:27 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -38,7 +38,7 @@ "This is a hash-table variables passed by the thw key is a keyword and all values are stored as strings.") -(defvar *query-vars* (make-hash-table) +(defvar *query-vars* (make-hash-table :test 'equal) "A hash-table of all variables passed through a GET or POST method, the key is a string, and all values are stored in string form.") Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.18 clhp/ChangeLog:1.19 --- clhp/ChangeLog:1.18 Tue Oct 21 00:16:58 2003 +++ clhp/ChangeLog Tue Oct 21 12:57:27 2003 @@ -1,5 +1,8 @@ 2003-10-21 <ant(a)afghan.dogpound> + * cgi.lisp (*QUERY-VARS*): Fixed so test is #'equal, which will + work properly with strings + * examples/index.clhp (PRINT-HASH-TO-TABLE): Modified to work with new hash-tables @@ -118,4 +121,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.18 2003/10/21 04:16:58 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.19 2003/10/21 16:57:27 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: clhp/package.lisp clhp/cgi.lisp clhp/TODO clhp/ChangeLog
by Anthony Ventimiglia 21 Oct '03

21 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv8963 Modified Files: package.lisp cgi.lisp TODO ChangeLog Log Message: * examples/index.clhp (PRINT-HASH-TO-TABLE): Modified to work with new hash-tables * examples/test.lisp (PRINT-HASH): Modified test program to work with new hash-table * cgi.lisp (*SERVER-ENV*,*QUERY-VARS*): Converted to hashtable. Date: Tue Oct 21 00:16:58 2003 Author: aventimiglia Index: clhp/package.lisp diff -u clhp/package.lisp:1.1 clhp/package.lisp:1.2 --- clhp/package.lisp:1.1 Fri Oct 17 08:58:04 2003 +++ clhp/package.lisp Tue Oct 21 00:16:58 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: package.lisp,v 1.1 2003/10/17 12:58:04 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: package.lisp,v 1.2 2003/10/21 04:16:58 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -24,7 +24,7 @@ (defpackage #:net.common-lisp.aventimiglia.clhp (:nicknames #:clhp #:cgi) ; The CGI will go away eventually - (:use #:cl) + (:use #:cl #:ext) (:export #:*server-env* #:*query-vars* #:header #:debug #:init #:parse #:*clhp-version* #:echo #:include #:xml-element #:make-xml-element #:copy-xml-element #:xml-element-attributes Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.12 clhp/cgi.lisp:1.13 --- clhp/cgi.lisp:1.12 Fri Oct 17 09:11:44 2003 +++ clhp/cgi.lisp Tue Oct 21 00:16:58 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.12 2003/10/17 13:11:44 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.13 2003/10/21 04:16:58 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -24,7 +24,7 @@ (defmacro debug (expression) "Print out EXPRESSION and the result of (EVAL EXPRESSION)" - `(format t "(CGI:DEBUG: ~s --> ~s)~%" ,expression (eval ,expression))) + `(format t "(CLHP:DEBUG: ~s --> ~s)~%" ,expression (eval ,expression))) (defmacro explode-string (string) "Converts a string to a list of chars, this is an aux function used @@ -34,18 +34,13 @@ ;; External Symbol section -(defvar *server-env* nil - "This is an a-list of all environment variables passed by the -server, the CAR of each cons in the a-list is a keyword, and all -values are stored as strings, which should be converted if -necessary. Accessing would be something like the following: (ASSOC -:REQUEST_METHOD *SERVER-ENV*)") - -(defvar *query-vars* nil - "An a-list of all variables passed through a GET or POST method, the -CAR of each cons in the a-list is a keyword, and all data is kept in -string form so conversion may be necessary. Accessing would be as -follows: (ASSOC :FOO *QUERY-VARS*)") +(defvar *server-env* (make-hash-table) + "This is a hash-table variables passed by the thw key is a keyword +and all values are stored as strings.") + +(defvar *query-vars* (make-hash-table) + "A hash-table of all variables passed through a GET or POST method, the +key is a string, and all values are stored in string form.") ;; This will obviously be improved upon to handle different content ;; types, but for now it's just a stub to print plain text pages. It @@ -75,17 +70,21 @@ (defun init () "Initialize CGI, this should be called before any globals are accessed" - (setf *server-env* (ca-list-to-a-list ext:*environment-list*) - *query-vars* - (cond-bind - ((request-method (make-keyword - (a-list-value :REQUEST_METHOD - *server-env*)))) - ((eql request-method :POST) - (query-to-a-list (post-data))) - ((eql request-method :GET) - (query-to-a-list (get-data))))) - (values)) + (mapcar #'(lambda (key/val) + (setf (gethash (car key/val) *server-env*) + (cdr key/val))) + *environment-list*) + (mapcar #'(lambda (key/val-list) + (setf (gethash (car key/val-list) *query-vars*) + (cadr key/val-list))) + (cond-bind + ((request-method (make-keyword + (gethash :REQUEST_METHOD *server-env*)))) + ((eql request-method :POST) + (query-to-a-list (post-data))) + ((eql request-method :GET) + (query-to-a-list (get-data))))) + (values)) ;; ;; End of external symbols @@ -137,7 +136,7 @@ (defun get-data () "Returns GET data (QUERY_STRING) as an exploded string" - (explode-string (a-list-value :QUERY_STRING *server-env*))) + (explode-string (gethash :QUERY_STRING *server-env*))) ;; The closure makes sure we don't try to read from stdin twice (let ((get-switch nil) @@ -150,7 +149,7 @@ get-switch t post-char-list (read-n-chars (read-from-string - (a-list-value :CONTENT_LENGTH *server-env*)))) + (gethash :CONTENT_LENGTH *server-env*)))) post-char-list) post-char-list))) @@ -220,5 +219,5 @@ text header, echoing the error-message." (header :content-type :text/plain) (format t "CL-CGI: ~A~%" (error-message condition)) - (ext:quit)) + (quit)) Index: clhp/TODO diff -u clhp/TODO:1.8 clhp/TODO:1.9 --- clhp/TODO:1.8 Fri Oct 17 08:58:04 2003 +++ clhp/TODO Tue Oct 21 00:16:58 2003 @@ -1,16 +1,16 @@ -$Id: TODO,v 1.8 2003/10/17 12:58:04 aventimiglia Exp $ -*- outline -*- - -* Use ASDF for package building - -* Convert *QUERY-VARS* and *SERVER-ENV* to hashes - I should probably make interface functions to access them, actually - I should make them read-only maybe encapsulate a hash in a class and - only allow reading from external functions +$Id: TODO,v 1.9 2003/10/21 04:16:58 aventimiglia Exp $ -*- outline -*- * Test suite +** Convert all this to new deal with single package. + Maybe make separate files for each function, or group of related + or interdependant files. + ** Complete suite for :cgi ** Complete suite for :clhp ** Refine :test-suite + +* Declare Declaim and Proclaim + GO through everything and refine and type it all. * COMPILE-CGI This is just a convenience function that will compile and save fasl Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.17 clhp/ChangeLog:1.18 --- clhp/ChangeLog:1.17 Sat Oct 18 21:57:14 2003 +++ clhp/ChangeLog Tue Oct 21 00:16:58 2003 @@ -1,3 +1,15 @@ +2003-10-21 <ant(a)afghan.dogpound> + + * examples/index.clhp (PRINT-HASH-TO-TABLE): Modified to work with + new hash-tables + +2003-10-20 <ant(a)afghan.dogpound> + + * examples/test.lisp (PRINT-HASH): Modified test program to work + with new hash-table + + * cgi.lisp (*SERVER-ENV*,*QUERY-VARS*): Converted to hashtable. + 2003-10-18 <ant(a)afghan.dogpound> * examples/test.lisp: Changed CGI: namespace to CLHP:, CGI: no @@ -106,4 +118,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.17 2003/10/19 01:57:14 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.18 2003/10/21 04:16:58 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: clhp/examples/test.lisp clhp/examples/index.clhp
by Anthony Ventimiglia 21 Oct '03

21 Oct '03

Update of /project/clhp/cvsroot/clhp/examples In directory common-lisp.net:/tmp/cvs-serv8963/examples Modified Files: test.lisp index.clhp Log Message: * examples/index.clhp (PRINT-HASH-TO-TABLE): Modified to work with new hash-tables * examples/test.lisp (PRINT-HASH): Modified test program to work with new hash-table * cgi.lisp (*SERVER-ENV*,*QUERY-VARS*): Converted to hashtable. Date: Tue Oct 21 00:16:58 2003 Author: aventimiglia Index: clhp/examples/test.lisp diff -u clhp/examples/test.lisp:1.4 clhp/examples/test.lisp:1.5 --- clhp/examples/test.lisp:1.4 Sat Oct 18 21:57:13 2003 +++ clhp/examples/test.lisp Tue Oct 21 00:16:58 2003 @@ -19,19 +19,28 @@ ;; HomePage: http://common-lisp.net/project/clhp/ (ext:file-comment - "$Id: test.lisp,v 1.4 2003/10/19 01:57:13 aventimiglia Exp $") + "$Id: test.lisp,v 1.5 2003/10/21 04:16:58 aventimiglia Exp $") -(clhp:init) -(clhp:header :extra (list "Content-Language: en")) +(use-package :clhp) -(clhp:debug 'clhp:*query-vars*) -(clhp:debug 'clhp:*server-env*) +(defun print-hash (table &optional (stream t)) + (declare (type hash-table table)) + (maphash #'(lambda (k v) (format stream "~S = ~S~%" k v)) table)) + +(init) +(header :extra (list "Content-Language: en")) + +(debug '*query-vars*) +(debug '*server-env*) + +(debug '(print-hash *query-vars*)) +(debug '(print-hash *server-env*)) ;; Test of CLHP::GET-POST to make sure it only actually reads once. -(if (string= (cdr (assoc :REQUEST_METHOD clhp:*server-env*)) "POST") +(if (string= (cdr (assoc :REQUEST_METHOD *server-env*)) "POST") (progn - (clhp:debug '(clhp::post-data)) - (clhp:debug '(clhp::post-data)))) + (debug '(post-data)) + (debug '(post-data)))) -(format t "~%--------~% $Date: 2003/10/19 01:57:13 $~%") +(format t "~%--------~% $Date: 2003/10/21 04:16:58 $~%") Index: clhp/examples/index.clhp diff -u clhp/examples/index.clhp:1.6 clhp/examples/index.clhp:1.7 --- clhp/examples/index.clhp:1.6 Wed Oct 15 08:50:51 2003 +++ clhp/examples/index.clhp Tue Oct 21 00:16:58 2003 @@ -27,7 +27,9 @@ ;; will actually be written, it is meant to show examples of some of ;; the possibilities CLHP will allow -(cgi:init) +(use-package :clhp) + +(init) (defun bold (str) "This is just an example (and test) to show that functions can be defined in documents. In reality, if you were working on a large site, @@ -66,27 +68,21 @@ <hr /> <?clhp -(defmacro print-a-list-table (a-list) +(defmacro print-hash-to-table (hash-table) `(echo - (tag 'h3 'align 'center ',a-list) + (tag 'h3 'align 'center ',hash-table) (tag '|table| 'border 1 - (cons (tag 'tr - (list - (tag 'td (tag "b" "Name")) + (cons + (tag 'tr + (list (tag 'td (tag "b" "Name")) (tag 'td (tag '|b| '|Value|)))) - (do* ((list ,a-list (cdr list)) - (k/v-pair (car list) (car list)) - (row-tag (tag "tr" - (list (tag "td" (car k/v-pair)) - (tag '|td| (cdr k/v-pair)))) - (tag "tr" - (list (tag "td" (car k/v-pair)) - (tag '|td| (cdr k/v-pair))))) - (rows (list row-tag) (cons row-tag rows))) - ((null list) (nreverse rows))))))) + (let (l) (maphash #'(lambda (key value) + (push (tag 'tr + (list (tag 'td key) (tag 'td value))) + l)) ,hash-table) l))))) -(print-a-list-table cgi:*server-env*) -(print-a-list-table cgi:*query-vars*) +(print-hash-to-table *server-env*) +(print-hash-to-table *query-vars*) ?> </body>

1 0

[clhp-cvs] CVS update: clhp/tests/test-suite.lisp clhp/tests/clhp-test.lisp clhp/tests/cgi-test.lisp
by Anthony Ventimiglia 21 Oct '03

21 Oct '03

Update of /project/clhp/cvsroot/clhp/tests In directory common-lisp.net:/tmp/cvs-serv1666/tests Modified Files: test-suite.lisp clhp-test.lisp cgi-test.lisp Log Message: Fixed cvs keywords Date: Mon Oct 20 23:09:20 2003 Author: aventimiglia Index: clhp/tests/test-suite.lisp diff -u clhp/tests/test-suite.lisp:1.3 clhp/tests/test-suite.lisp:1.4 --- clhp/tests/test-suite.lisp:1.3 Thu Oct 16 12:57:25 2003 +++ clhp/tests/test-suite.lisp Mon Oct 20 23:09:20 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id") +#+cmu (ext:file-comment "$Id: test-suite.lisp,v 1.4 2003/10/21 03:09:20 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia Index: clhp/tests/clhp-test.lisp diff -u clhp/tests/clhp-test.lisp:1.1 clhp/tests/clhp-test.lisp:1.2 --- clhp/tests/clhp-test.lisp:1.1 Thu Oct 16 12:57:25 2003 +++ clhp/tests/clhp-test.lisp Mon Oct 20 23:09:20 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id") +#+cmu (ext:file-comment "$Id: clhp-test.lisp,v 1.2 2003/10/21 03:09:20 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia Index: clhp/tests/cgi-test.lisp diff -u clhp/tests/cgi-test.lisp:1.10 clhp/tests/cgi-test.lisp:1.11 --- clhp/tests/cgi-test.lisp:1.10 Thu Oct 16 12:57:25 2003 +++ clhp/tests/cgi-test.lisp Mon Oct 20 23:09:20 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id") +#+cmu (ext:file-comment "$Id: cgi-test.lisp,v 1.11 2003/10/21 03:09:20 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -43,19 +43,19 @@ ;; (mapcar #'run-test *cgi-tests*) (defparameter *cgi-tests* (list - (make-instance 'function-test-data - :symbol 'cgi::explode-string - :test-args '("Hello There") - :result-form '(#\H #\e #\l #\l #\o #\Space #\T #\h #\e #\r - #\e)) - (make-instance 'function-test-data - :symbol 'cgi::split-char-list - :test-args '(#\Space (cgi::explode-string "Ab CdE F")) - :result-form '((#\A #\b) (#\C #\d #\E) (#\F))) - (make-instance 'function-test-data - :symbol 'cgi::implode-string - :test-args '((cgi::explode-string "Hello")) - :result-form "Hello") +; (make-instance 'function-test-data +; :symbol 'cgi::explode-string +; :test-args '("Hello There") +; :result-form '(#\H #\e #\l #\l #\o #\Space #\T #\h #\e #\r +; #\e)) +; (make-instance 'function-test-data +; :symbol 'cgi::split-char-list +; :test-args '(#\Space (cgi::explode-string "Ab CdE F")) +; :result-form '((#\A #\b) (#\C #\d #\E) (#\F))) +; (make-instance 'function-test-data +; :symbol 'cgi::implode-string +; :test-args '((cgi::explode-string "Hello")) +; :result-form "Hello") (make-instance 'function-test-data :symbol 'cgi::url-decode-char-list :test-args '((cgi::explode-string "foo%34%2a"))

1 0

[clhp-cvs] CVS update: clhp/ChangeLog
by Anthony Ventimiglia 19 Oct '03

19 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv16366 Modified Files: ChangeLog Log Message: Changed CGI: namespace to CLHP:, CGI: no longer is a separate package, so it's use is depreciated. Date: Sat Oct 18 21:57:14 2003 Author: aventimiglia Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.16 clhp/ChangeLog:1.17 --- clhp/ChangeLog:1.16 Fri Oct 17 09:11:44 2003 +++ clhp/ChangeLog Sat Oct 18 21:57:14 2003 @@ -1,3 +1,8 @@ +2003-10-18 <ant(a)afghan.dogpound> + + * examples/test.lisp: Changed CGI: namespace to CLHP:, CGI: no + longer is a separate package, so it's use is depreciated. + 2003-10-17 <ant(a)afghan.dogpound> * (Module): Moved COND-BIND, IF-BIND, A-LIST-VALUE, @@ -101,4 +106,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.16 2003/10/17 13:11:44 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.17 2003/10/19 01:57:14 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: clhp/examples/test.lisp
by Anthony Ventimiglia 19 Oct '03

19 Oct '03

Update of /project/clhp/cvsroot/clhp/examples In directory common-lisp.net:/tmp/cvs-serv16366/examples Modified Files: test.lisp Log Message: Changed CGI: namespace to CLHP:, CGI: no longer is a separate package, so it's use is depreciated. Date: Sat Oct 18 21:57:13 2003 Author: aventimiglia Index: clhp/examples/test.lisp diff -u clhp/examples/test.lisp:1.3 clhp/examples/test.lisp:1.4 --- clhp/examples/test.lisp:1.3 Wed Oct 15 08:50:51 2003 +++ clhp/examples/test.lisp Sat Oct 18 21:57:13 2003 @@ -19,19 +19,19 @@ ;; HomePage: http://common-lisp.net/project/clhp/ (ext:file-comment - "$Id: test.lisp,v 1.3 2003/10/15 12:50:51 aventimiglia Exp $") + "$Id: test.lisp,v 1.4 2003/10/19 01:57:13 aventimiglia Exp $") -(cgi:init) -(cgi:header :extra (list "Content-Language: en")) +(clhp:init) +(clhp:header :extra (list "Content-Language: en")) -(cgi:debug 'cgi:*query-vars*) -(cgi:debug 'cgi:*server-env*) +(clhp:debug 'clhp:*query-vars*) +(clhp:debug 'clhp:*server-env*) -;; Test of CGI::GET-POST to make sure it only actually reads once. -(if (string= (cdr (assoc :REQUEST_METHOD cgi:*server-env*)) "POST") +;; Test of CLHP::GET-POST to make sure it only actually reads once. +(if (string= (cdr (assoc :REQUEST_METHOD clhp:*server-env*)) "POST") (progn - (cgi:debug '(cgi::post-data)) - (cgi:debug '(cgi::post-data)))) + (clhp:debug '(clhp::post-data)) + (clhp:debug '(clhp::post-data)))) -(format t "~%--------~% $Date: 2003/10/15 12:50:51 $~%") +(format t "~%--------~% $Date: 2003/10/19 01:57:13 $~%")

1 0

[clhp-cvs] CVS update: clhp/utility.lisp clhp/clhp.lisp clhp/clhp.asd clhp/cgi.lisp clhp/ChangeLog clhp/.cvsignore
by Anthony Ventimiglia 17 Oct '03

17 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv9555 Modified Files: clhp.lisp clhp.asd cgi.lisp ChangeLog .cvsignore Added Files: utility.lisp Log Message: * (Module): Moved COND-BIND, IF-BIND, A-LIST-VALUE, CA-LIST-TO-A-LIST, MAKE-KEYWORD, and LIST-TO-A-LIST out of cgi.lisp in here. * clhp.asd, package.lisp, clhp.lisp, cgi.lisp: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about. Date: Fri Oct 17 09:11:44 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.16 clhp/clhp.lisp:1.17 --- clhp/clhp.lisp:1.16 Fri Oct 17 08:58:04 2003 +++ clhp/clhp.lisp Fri Oct 17 09:11:44 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.16 2003/10/17 12:58:04 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.17 2003/10/17 13:11:44 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,18 +21,6 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -;(eval-when (:compile-toplevel) -; (unless (find-package :cgi) -; (load "cgi"))) - -;(defpackage #:net.common-lisp.aventimiglia.clhp -; (:nicknames :clhp) -; (:use :cgi :cl) -; (:import-from :cgi #:cond-bind #:list-to-a-list) -; (:export #:parse #:*clhp-version* #:echo #:include #:xml-element -; #:make-xml-element #:copy-xml-element #:xml-element-attributes -; #:xml-element-name #:xml-element-contents #:xml-element-p #:tag)) - (in-package :clhp) ;; This elaborate reader macro converts the cvs Date keywords and @@ -41,7 +29,7 @@ ;; will override the CVS keyword (defconstant *CLHP-VERSION* #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/17 12:58:04 $")) + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/17 13:11:44 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) @@ -83,8 +71,8 @@ to use CLHP. See README for an example." (use-package :cgi) (use-package :clhp) - (cgi:init) - (cgi:header :content-type + (init) + (header :content-type :text/html :extra '(#.(format Index: clhp/clhp.asd diff -u clhp/clhp.asd:1.1 clhp/clhp.asd:1.2 --- clhp/clhp.asd:1.1 Fri Oct 17 08:58:04 2003 +++ clhp/clhp.asd Fri Oct 17 09:11:44 2003 @@ -1,5 +1,4 @@ -#+cmu (ext:file-comment "$Id: clhp.asd,v 1.1 2003/10/17 12:58:04 aventimiglia Exp $") -;; -*- lisp -*- +#+cmu (ext:file-comment "$Id: clhp.asd,v 1.2 2003/10/17 13:11:44 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -37,5 +36,6 @@ :licence "GNU Lesser General Public License" :components ((:file "package") - (:file "cgi" :depends-on ("package")) + (:file "utility" :depends-on ("package")) + (:file "cgi" :depends-on ("utility")) (:file "clhp" :depends-on ("cgi")))) Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.11 clhp/cgi.lisp:1.12 --- clhp/cgi.lisp:1.11 Fri Oct 17 08:58:04 2003 +++ clhp/cgi.lisp Fri Oct 17 09:11:44 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.11 2003/10/17 12:58:04 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.12 2003/10/17 13:11:44 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -20,17 +20,7 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -;(defpackage #:net.common-lisp.aventimiglia.cgi -; (:nicknames #:cgi) -; (:use :cl) -; (:export #:*server-env* #:*query-vars* #:header #:debug #:init)) - -(in-package :cgi) - -(defmacro make-keyword (name) - "Translates a string into a keyword: (MAKE-KEYWORD \"foo\") --> -:FOO" - `(read-from-string (format nil ":~a" ,name))) +(in-package :clhp) (defmacro debug (expression) "Print out EXPRESSION and the result of (EVAL EXPRESSION)" @@ -42,19 +32,6 @@ ex: (EXPLODE-STRING (\"Hello\") --> (#\H #\e #\l #\l #\o)" `(concatenate 'list ,string)) -(defmacro a-list-value (key a-list) - "returns the value from a (KEY . VALUE) A-LIST" - `(cadr (assoc ,key ,a-list))) - -(defmacro cond-bind ((&rest bindings) &body body) - "A COND wrapped in a Let" - `(let (,@bindings) (cond ,@body))) - -(defmacro if-bind ((&rest bindings) test if else) - "An IF wrapped in a LET" - `(let (,@bindings) (if ,test ,if ,else))) - - ;; External Symbol section (defvar *server-env* nil @@ -92,10 +69,6 @@ (format t "Content-type: ~a~%~%" content-type) (setf done t)))) -(defun ca-list-to-a-list (list) - "Converts a CONS type a-list '((A . 3)(B . 4)) to a list type '((A 3)(B 4))" - (mapcar #'(lambda (cons) (list (car cons)(cdr cons))) list)) - ;; This sets the main variables, since the library is already part of the lisp ;; core, we can't use an eval-when, I may eventually make a cgi:init that also ;; prints the header. @@ -180,19 +153,6 @@ (a-list-value :CONTENT_LENGTH *server-env*)))) post-char-list) post-char-list))) - -(defun list-to-a-list (list &optional a-list) - "Converts a list to an a-list, pairing odd and even elements. If an -odd number of elements are in LIST, the last element is returnes as -the second value. -ex: (LIST-TO-A-LIST '(a b c d) --> '((a b)(c d)) NIL -ex: (LIST-TO-A-LIST '(1 2 3 4 5) --> '((1 2)(3 4)) 5" - (cond - ((null list) (nreverse a-list)) - ((= 1 (length list)) (values (nreverse a-list) (car list))) - (t (list-to-a-list (cddr list) - (cons (list (car list) (cadr list)) - a-list))))) (defun query-to-a-list (get/post-data) (list-to-a-list Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.15 clhp/ChangeLog:1.16 --- clhp/ChangeLog:1.15 Fri Oct 17 08:58:04 2003 +++ clhp/ChangeLog Fri Oct 17 09:11:44 2003 @@ -1,5 +1,9 @@ 2003-10-17 <ant(a)afghan.dogpound> + * (Module): Moved COND-BIND, IF-BIND, A-LIST-VALUE, + CA-LIST-TO-A-LIST, MAKE-KEYWORD, and LIST-TO-A-LIST out of + cgi.lisp in here. + * clhp.asd, package.lisp, clhp.lisp, cgi.lisp: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about. @@ -97,4 +101,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.16 2003/10/17 13:11:44 aventimiglia Exp $ \ No newline at end of file Index: clhp/.cvsignore diff -u clhp/.cvsignore:1.2 clhp/.cvsignore:1.3 --- clhp/.cvsignore:1.2 Fri Oct 17 08:58:04 2003 +++ clhp/.cvsignore Fri Oct 17 09:11:44 2003 @@ -3,3 +3,4 @@ clhp.x86f package.x86f start-clcgi.x86f +utility.x86f

1 0

[clhp-cvs] CVS update: clhp/package.lisp clhp/clhp.asd clhp/clhp.lisp clhp/cgi.lisp clhp/TODO clhp/Makefile clhp/ChangeLog clhp/.cvsignore
by Anthony Ventimiglia 17 Oct '03

17 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv27650 Modified Files: clhp.lisp cgi.lisp TODO Makefile ChangeLog .cvsignore Added Files: package.lisp clhp.asd Log Message: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about. Date: Fri Oct 17 08:58:04 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.15 clhp/clhp.lisp:1.16 --- clhp/clhp.lisp:1.15 Thu Oct 16 15:31:59 2003 +++ clhp/clhp.lisp Fri Oct 17 08:58:04 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.15 2003/10/16 19:31:59 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.16 2003/10/17 12:58:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,17 +21,18 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -(eval-when (:compile-toplevel) - (unless (find-package :cgi) - (load "cgi"))) +;(eval-when (:compile-toplevel) +; (unless (find-package :cgi) +; (load "cgi"))) + +;(defpackage #:net.common-lisp.aventimiglia.clhp +; (:nicknames :clhp) +; (:use :cgi :cl) +; (:import-from :cgi #:cond-bind #:list-to-a-list) +; (:export #:parse #:*clhp-version* #:echo #:include #:xml-element +; #:make-xml-element #:copy-xml-element #:xml-element-attributes +; #:xml-element-name #:xml-element-contents #:xml-element-p #:tag)) -(defpackage #:net.common-lisp.aventimiglia.clhp - (:nicknames :clhp) - (:use :cgi :cl) - (:import-from :cgi #:cond-bind #:list-to-a-list) - (:export #:parse #:*clhp-version* #:echo #:include #:xml-element - #:make-xml-element #:copy-xml-element #:xml-element-attributes - #:xml-element-name #:xml-element-contents #:xml-element-p #:tag)) (in-package :clhp) ;; This elaborate reader macro converts the cvs Date keywords and @@ -40,7 +41,7 @@ ;; will override the CVS keyword (defconstant *CLHP-VERSION* #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/16 19:31:59 $")) + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/17 12:58:04 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.10 clhp/cgi.lisp:1.11 --- clhp/cgi.lisp:1.10 Wed Oct 15 10:44:04 2003 +++ clhp/cgi.lisp Fri Oct 17 08:58:04 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.10 2003/10/15 14:44:04 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.11 2003/10/17 12:58:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -20,10 +20,10 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -(defpackage #:net.common-lisp.aventimiglia.cgi - (:nicknames #:cgi) - (:use :cl) - (:export #:*server-env* #:*query-vars* #:header #:debug #:init)) +;(defpackage #:net.common-lisp.aventimiglia.cgi +; (:nicknames #:cgi) +; (:use :cl) +; (:export #:*server-env* #:*query-vars* #:header #:debug #:init)) (in-package :cgi) Index: clhp/TODO diff -u clhp/TODO:1.7 clhp/TODO:1.8 --- clhp/TODO:1.7 Wed Oct 15 10:44:04 2003 +++ clhp/TODO Fri Oct 17 08:58:04 2003 @@ -1,4 +1,6 @@ -$Id: TODO,v 1.7 2003/10/15 14:44:04 aventimiglia Exp $ -*- outline -*- +$Id: TODO,v 1.8 2003/10/17 12:58:04 aventimiglia Exp $ -*- outline -*- + +* Use ASDF for package building * Convert *QUERY-VARS* and *SERVER-ENV* to hashes I should probably make interface functions to access them, actually @@ -7,7 +9,7 @@ * Test suite ** Complete suite for :cgi -** Write suite for :clhp +** Complete suite for :clhp ** Refine :test-suite * COMPILE-CGI Index: clhp/Makefile diff -u clhp/Makefile:1.14 clhp/Makefile:1.15 --- clhp/Makefile:1.14 Thu Oct 16 15:40:18 2003 +++ clhp/Makefile Fri Oct 17 08:58:04 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.14 2003/10/16 19:40:18 aventimiglia Exp $ +# $Id: Makefile,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -57,8 +57,9 @@ LISPC=$(LISP) -noinit -load config/lispc -eval '(make)' -SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp -LIBS=cgi.x86f clhp.x86f start-clcgi.x86f +BUILD_CORE=config/build-core.x86f +BINS=start-clcgi.x86f +SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp package.lisp clhp.asd CORE=clhp.core LISPCBIN=config/lispc.x86f RUNCGI=config/runclcgi @@ -84,7 +85,7 @@ # makefile most likeley will not match the cvs version ID in # clhp.lisp, since they depend on their own file's cvs date keyword. -CVSID=$(shell echo $Date: 2003/10/16 19:40:18 $ | \ +CVSID=$(shell echo $Date: 2003/10/17 12:58:04 $ | \ awk '{print $$2}'| sed s/\\///g )cvs VERSION=$(CVSID) @@ -94,7 +95,7 @@ RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive -all: $(LISPCBIN) $(LIBS) $(CORE) $(RUNCGI) +all: $(LISPCBIN) $(CORE) $(RUNCGI) $(BINS) .PHONY: all install uninstall clean clean-all clean-backups install-dirs \ install-source install-source-dirs uninstall-files uninstall-dirs \ @@ -115,8 +116,8 @@ $(LISPCBIN): config/lispc.lisp -$(CORE): $(SOURCES) config/build-core.lisp - $(LISP) -noinit -eval '(load (open "config/build-core.lisp"))' +$(CORE): $(SOURCES) $(BUILD_CORE) + $(LISP) -noinit -load "config/build-core" $(RUNCGI): $(RUNCGI).src sed 's:$LISP=$:\1$(LISP):' < $< | \ @@ -124,7 +125,7 @@ sed 's:$CMUCLLIB=$:\1$(LIBDIR):' > $@ install: all install-dirs install-core - for f in $(LIBS); do \ + for f in $(BINS) ; do \ $(INSTALLFILE) $$f $(LIBDIR) ; \ done $(INSTALL) $(DOCS) $(DOCDIR) @@ -194,11 +195,12 @@ clean-all: clean-all-recursive clean clean-backups clean-dist clean: clean-recursive - for f in $(LIBS) $(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) \ + for f in $(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) \ $(TESTS) $(TARBALL); \ do \ if test -f $$f ; then rm -v $$f ; fi \ done + find -iname "*.x86f" -exec rm -v {} \; $(MAKE) -C examples clean find -iname "*.tar.gz" -exec rm -v {} \; Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.14 clhp/ChangeLog:1.15 --- clhp/ChangeLog:1.14 Thu Oct 16 12:57:25 2003 +++ clhp/ChangeLog Fri Oct 17 08:58:04 2003 @@ -1,3 +1,9 @@ +2003-10-17 <ant(a)afghan.dogpound> + + * clhp.asd, package.lisp, clhp.lisp, cgi.lisp: Converted all this + to an ASDF system, it's not quite battle tested, but hey, that's + what this is all about. + 2003-10-16 <ant(a)afghan.dogpound> * tests/clhp-test.lisp (*CLHP-TESTS*): Wrote tests for most of @@ -91,4 +97,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.14 2003/10/16 16:57:25 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ \ No newline at end of file Index: clhp/.cvsignore diff -u clhp/.cvsignore:1.1 clhp/.cvsignore:1.2 --- clhp/.cvsignore:1.1 Tue Oct 14 00:33:41 2003 +++ clhp/.cvsignore Fri Oct 17 08:58:04 2003 @@ -1,4 +1,5 @@ cgi.x86f clhp.core clhp.x86f +package.x86f start-clcgi.x86f

1 0

[clhp-cvs] CVS update: clhp/config/build-core.lisp clhp/config/.cvsignore
by Anthony Ventimiglia 17 Oct '03

17 Oct '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv27650/config Modified Files: build-core.lisp .cvsignore Log Message: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about. Date: Fri Oct 17 08:58:03 2003 Author: aventimiglia Index: clhp/config/build-core.lisp diff -u clhp/config/build-core.lisp:1.3 clhp/config/build-core.lisp:1.4 --- clhp/config/build-core.lisp:1.3 Wed Oct 15 08:50:52 2003 +++ clhp/config/build-core.lisp Fri Oct 17 08:58:03 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: build-core.lisp,v 1.3 2003/10/15 12:50:52 aventimiglia Exp $") + "$Id: build-core.lisp,v 1.4 2003/10/17 12:58:03 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -37,21 +37,24 @@ (block abort (let ((output-file #p"clhp.core") - (packages '(:cgi :clhp))) - (gc-off) - - (dolist (package packages) - (when (find-package package) - (delete-package package)) - (handler-case - (load (format nil "~A" (string-downcase (string package)))) - (file-error (c) - (format - t - "There was an file-error in loading \"~A\"~%Perhaps the proper packages did not build successfully, or maybe you're mokeying around.~%" - (file-error-pathname c)) - (unix:unix-exit 1)))) +; (packages '(:cgi :clhp))) +) + (gc-off) + (asdf:operate 'asdf:load-op 'clhp) + +; (dolist (package packages) +; (when (find-package package) +; (delete-package package)) +; (handler-case +; (load (format nil "~A" (string-downcase (string package)))) +; (file-error (c) +; (format +; t +; "There was an file-error in loading \"~A\"~%Perhaps the proper packages did not build successfully, or maybe you're mokeying around.~%" +; (file-error-pathname c)) +; (unix:unix-exit 1)))) +; (when (probe-file output-file) (multiple-value-bind (ignore old new) Index: clhp/config/.cvsignore diff -u clhp/config/.cvsignore:1.1 clhp/config/.cvsignore:1.2 --- clhp/config/.cvsignore:1.1 Tue Oct 14 18:47:29 2003 +++ clhp/config/.cvsignore Fri Oct 17 08:58:03 2003 @@ -1,2 +1,3 @@ +build-core.x86f lispc.x86f runclcgi

1 0