Author: hhubner Date: 2006-11-20 10:19:07 -0500 (Mon, 20 Nov 2006) New Revision: 2081 Modified: trunk/projects/bos/build.lisp trunk/projects/bos/statistics/Makefile trunk/projects/bos/web/web.lisp Log: Make worldpay-test-mode work as option in web.rc Modified: trunk/projects/bos/build.lisp =================================================================== --- trunk/projects/bos/build.lisp 2006-11-19 17:00:46 UTC (rev 2080) +++ trunk/projects/bos/build.lisp 2006-11-20 15:19:07 UTC (rev 2081) @@ -10,8 +10,8 @@ (defun read-configuration (pathname) (with-open-file (s pathname) - (loop for form = (read s nil nil) - while form + (loop for form = (read s nil :end-of-file) + while (not (eq form :end-of-file)) collect form))) (defmacro define-toggle-switch (switch-name variable default) Modified: trunk/projects/bos/statistics/Makefile =================================================================== --- trunk/projects/bos/statistics/Makefile 2006-11-19 17:00:46 UTC (rev 2080) +++ trunk/projects/bos/statistics/Makefile 2006-11-20 15:19:07 UTC (rev 2081) @@ -1,5 +1,5 @@ -BASE_URL = http://192.168.254.132:8080/reports-xml +BASE_URL = http://217.13.200.204:8080/reports-xml YEAR = LOGIN = OUTPUT_DIR = ../payment-website/images/statistics @@ -23,4 +23,4 @@ .xsl.svg: xsltproc -o $*.xml $*.xsl '$(BASE_URL)/$*/$(YEAR)$(LOGIN)' xsltproc -o $(OUTPUT_DIR)/$*$(YEAR).svg buildSVGLineChart.xsl $*.xml - rm $*.xml \ No newline at end of file + rm $*.xml Modified: trunk/projects/bos/web/web.lisp =================================================================== --- trunk/projects/bos/web/web.lisp 2006-11-19 17:00:46 UTC (rev 2080) +++ trunk/projects/bos/web/web.lisp 2006-11-20 15:19:07 UTC (rev 2081) @@ -14,13 +14,15 @@ (defvar *vhosts*) (defvar *website-directory*) (defvar *website-url*) +(defvar *worldpay-test-mode*) -(defun init (&key (port 8080) (listeners 1) (vhosts '("localhost")) website-directory website-url) +(defun init (&key (port 8080) (listeners 1) (vhosts '("localhost")) website-directory website-url worldpay-test-mode) (setf *port* port) (setf *listeners* listeners) (setf *vhosts* vhosts) (setf *website-url* website-url) (setf *website-directory* website-directory) + (setf *worldpay-test-mode* worldpay-test-mode) (unless *website-directory* (error ":website-directory not specified")) (reinit)) @@ -30,7 +32,8 @@ (unpublish :all t) (worldpay-test::publish-worldpay-test :website-directory *website-directory* :vhosts *vhosts* - :website-url *website-url*) + :website-url *website-url* + :worldpay-test-mode *worldpay-test-mode*) (format t "~&; Starting aserve~@[ in debug mode~].~%" debug) (force-output) (setq *webserver*