October 2006 - bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] r2008 - branches/xml-class-rework/projects/bos/worldpay-test
by bknr＠bknr.net 20 Oct '06

20 Oct '06

Author: hhubner Date: 2006-10-20 01:36:33 -0400 (Fri, 20 Oct 2006) New Revision: 2008 Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp Log: Update wp transaction id with set-slot-values Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-10-20 05:06:38 UTC (rev 2007) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-10-20 05:36:33 UTC (rev 2008) @@ -29,9 +29,9 @@ (let* ((contract (get-contract (parse-integer cartId))) (sponsor (contract-sponsor contract))) (change-slot-values sponsor 'bknr.web::email email) + (change-slot-values contract 'bos.m2::worldpay-trans-id transId) (sponsor-set-country sponsor country) (contract-set-paidp contract (format nil "~A: paid via worldpay" (format-date-time))) - (setf (contract-worldpay-trans-id contract) transId) (setf (get-template-var :master-code) (sponsor-master-code sponsor)) (setf (get-template-var :sponsor-id) (sponsor-id sponsor)))) (mapc #'emit-template-node children))

1 0

[bknr-cvs] r2007 - in branches/xml-class-rework/projects/bos: . m2 payment-website/static tools worldpay-test
by bknr＠bknr.net 20 Oct '06

20 Oct '06

Author: hhubner Date: 2006-10-20 01:06:38 -0400 (Fri, 20 Oct 2006) New Revision: 2007 Added: branches/xml-class-rework/projects/bos/tools/ branches/xml-class-rework/projects/bos/tools/wp-callpack-redirect.pl Modified: branches/xml-class-rework/projects/bos/m2/m2.lisp branches/xml-class-rework/projects/bos/m2/mail-generator.lisp branches/xml-class-rework/projects/bos/m2/packages.lisp branches/xml-class-rework/projects/bos/payment-website/static/cms.js branches/xml-class-rework/projects/bos/worldpay-test/config.lisp branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp Log: Add reverse proxy for WorldPay callbacks to distribute callbacks between test and production system depending on the testMode. Add sponsor slot to contain the worldpay transaction id, link back to WorldPay CMS for easier access. Modified: branches/xml-class-rework/projects/bos/m2/m2.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-10-20 05:06:38 UTC (rev 2007) @@ -183,6 +183,7 @@ (color :read) (download-only :read) (cert-issued :read) + (worldpay-trans-id :update :initform nil) (expires :read :documentation "universal time which specifies the time the contract expires (is deleted) when it has not been paid for" :initform nil)) (:default-initargs :m2s nil Modified: branches/xml-class-rework/projects/bos/m2/mail-generator.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/mail-generator.lisp 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/m2/mail-generator.lisp 2006-10-20 05:06:38 UTC (rev 2007) @@ -125,6 +125,20 @@ email vorname name strasse plz ort contract-id)))) +(defun worldpay-callback-request-to-vcard (request) + (with-query-params (request + cartId + transId + MC_sponsorid + MC_donationcert-yearly + MC_gift + address + postcode + country + email + tel))) + + (defun mail-request-parameters (req subject) (send-system-mail :subject subject :content-type "text/html; charset=UTF-8" Modified: branches/xml-class-rework/projects/bos/m2/packages.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/packages.lisp 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/m2/packages.lisp 2006-10-20 05:06:38 UTC (rev 2007) @@ -103,6 +103,7 @@ #:contract-set-paidp #:contract-price #:contract-issue-cert + #:contract-worldpay-trans-id #:contract-pdf-pathname #:contract-pdf-url #:contract-download-only-p Modified: branches/xml-class-rework/projects/bos/payment-website/static/cms.js =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/static/cms.js 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/payment-website/static/cms.js 2006-10-20 05:06:38 UTC (rev 2007) @@ -52,7 +52,7 @@ var stats_name = select[select.options.selectedIndex].value; document.getElementById('stats').innerHTML - = '<embed src="/images/statistics/' + stats_name + '.svg" width="800" height="600" type="image/svg+xml"></embed>'; + = '<embed src="/images/statistics/' + stats_name + '.svg" width="800" height="600" type="image/svg+xml"></embed>'; return true; } Added: branches/xml-class-rework/projects/bos/tools/wp-callpack-redirect.pl =================================================================== --- branches/xml-class-rework/projects/bos/tools/wp-callpack-redirect.pl 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/tools/wp-callpack-redirect.pl 2006-10-20 05:06:38 UTC (rev 2007) @@ -0,0 +1,26 @@ +#!/usr/bin/perl -w + +use strict; + +use HTTP::Daemon; +use HTTP::Status; +use LWP::UserAgent; + +my $port = "3456"; + +my $ua = LWP::UserAgent->new; +my $daemon = HTTP::Daemon->new(LocalPort => 3456, ReuseAddr => 1); + +while (my $client = $daemon->accept) { + my $request = $client->get_request; + if ($request) { + my $content = $request->content; + + my $is_test = ($content =~ /testMode=100/); + my $host = $is_test ? "test.createrainforest.org" : "createrainforest.org"; + my $response = $ua->get("http://" . $host . ":8080/handle-sale?" . $content); + $client->send_response($response); + print "Redirected request to ", ($is_test ? "TEST" : "PRODUCTION"), " system\n"; + } + $client->close; +} Modified: branches/xml-class-rework/projects/bos/worldpay-test/config.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/config.lisp 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/worldpay-test/config.lisp 2006-10-20 05:06:38 UTC (rev 2007) @@ -4,6 +4,9 @@ (defparameter *worldpay-installation-id* 103530 "Installation-ID für Worldpay") +;; Worldpay Test Mode +(defparameter *worldpay-test-mode* t) + ;; URL für BASE HREFs (defparameter *website-url* "http://create-rainforest.org") Modified: branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp 2006-10-20 05:06:38 UTC (rev 2007) @@ -134,7 +134,10 @@ (:td (:princ-safe (if (contract-paidp contract) "paid" "not paid"))) (:td (cmslink (format nil "cert-regen/~A" (store-object-id contract)) "Regenerate Certificate") (when (probe-file (contract-pdf-pathname contract)) - (html :br (cmslink (contract-pdf-url contract) "Show Certificate")))))))) + (html :br (cmslink (contract-pdf-url contract) "Show Certificate"))) + (when (contract-worldpay-trans-id contract) + (html :br ((:a :href (format nil "https://select.worldpay.com/wcc/admin?op-transInfo-~A=1" + (contract-worldpay-trans-id contract))))))))))) (:p (submit-button "save" "save") (submit-button "delete" "delete" :confirm "Really delete this sponsor?")))))) Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-10-20 05:06:38 UTC (rev 2007) @@ -25,12 +25,13 @@ (emit-without-quoting "<WPDISPLAY ITEM=banner>")) (define-bknr-tag process-payment (&key children) - (with-template-vars (cartId email country) + (with-template-vars (cartId transId email country) (let* ((contract (get-contract (parse-integer cartId))) (sponsor (contract-sponsor contract))) (change-slot-values sponsor 'bknr.web::email email) (sponsor-set-country sponsor country) (contract-set-paidp contract (format nil "~A: paid via worldpay" (format-date-time))) + (setf (contract-worldpay-trans-id contract) transId) (setf (get-template-var :master-code) (sponsor-master-code sponsor)) (setf (get-template-var :sponsor-id) (sponsor-id sponsor)))) (mapc #'emit-template-node children)) @@ -78,23 +79,24 @@ (language (session-variable :language))) (setf (get-template-var :worldpay-url) (if manual-transfer - (format nil "ueberweisung?contract-id=~a&amount=~a&numsqm=~a~@[&donationcert-yearly=1~]" + (format nil "ueberweisung?contract-id=~A&amount=~A&numsqm=~A~@[&donationcert-yearly=1~]" (store-object-id contract) price numsqm donationcert-yearly) - (format nil "https://select.worldpay.com/wcc/purchase?instId=~a&cartId=~a&amount=~a&curr…" ; &testMode=100 für test + (format nil "https://select.worldpay.com/wcc/purchase?instId=~A&cartId=~A&amount=~A&curr…" *worldpay-installation-id* (store-object-id contract) price language - (encode-urlencoded (format nil "~a ~a in Samboja Lestari" + (encode-urlencoded (format nil "~A ~A in Samboja Lestari" numsqm (if (string-equal language "de") "qm Regenwald" "sqm rain forest"))) (store-object-id sponsor) (sponsor-master-code sponsor) (if donationcert-yearly "1" "0") - (if gift "1" "0")))))) + (if gift "1" "0") + (when *worldpay-test-mode* "&testMode=100")))))) (mapc #'emit-template-node children)) (define-bknr-tag mail-transfer () Modified: branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-10-16 18:30:48 UTC (rev 2006) +++ branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-10-20 05:06:38 UTC (rev 2007) @@ -96,7 +96,7 @@ ()) (defmethod handle ((handler index-handler) req) - (redirect (format nil "/~a/index" (or (find-browser-prefered-language req) + (redirect (format nil "/~A/index" (or (find-browser-prefered-language req) *default-language*)) req)) @@ -135,8 +135,8 @@ (dolist (file (directory (merge-pathnames #p"images/statistics/*.svg" *website-directory*))) (html ((:option :value (pathname-name file)) (:princ-safe (pathname-name file))))))) - ((:p :id "stats") - ((:embed :src "/images/statistics/all-contracts.svg" :width 800 :height 600 :type "image/svg+xml") ""))))))) + ((:p :id "stats")) + ((:script :type "text/javascript") "statistic_selected()")))))) (defclass print-certificate-handler (admin-only-handler object-handler) () @@ -191,12 +191,14 @@ (find-browser-prefered-language req) *default-language*))))) -(defun publish-worldpay-test (&key website-directory website-url (vhosts :wild)) +(defun publish-worldpay-test (&key website-directory website-url (worldpay-test-mode t) (vhosts :wild)) (setf *website-directory* website-directory) (when website-url (setf *website-url* website-url)) + (setf *worldpay-test-mode* worldpay-test-mode) + (make-instance 'bos-website :name "BOS Website" :handler-definitions `(("/edit-poi" edit-poi-handler)

1 0

[bknr-cvs] r2006 - branches/xml-class-rework/projects/bos/statistics
by bknr＠bknr.net 16 Oct '06

16 Oct '06

Author: hhubner Date: 2006-10-16 14:30:48 -0400 (Mon, 16 Oct 2006) New Revision: 2006 Added: branches/xml-class-rework/projects/bos/statistics/mail-stats.sh Log: Script to mail out sponsor database automatically at night. Added: branches/xml-class-rework/projects/bos/statistics/mail-stats.sh =================================================================== --- branches/xml-class-rework/projects/bos/statistics/mail-stats.sh 2006-10-15 23:21:43 UTC (rev 2005) +++ branches/xml-class-rework/projects/bos/statistics/mail-stats.sh 2006-10-16 18:30:48 UTC (rev 2006) @@ -0,0 +1,11 @@ +#!/bin/sh + +FILE=/tmp/contracts.xml +URL=http://127.0.0.1:8080/reports-xml/all-contracts +FROM='MXM Automatic Mailer <mxm-automail(a)createrainforest.org>' +TO='MXM Administrator <mxm-administrator(a)createrainforest.org>' +SUBJECT='Square meter contract database' + +fetch -q -o $FILE $URL +perl -MMIME::Lite -e "MIME::Lite->new(From => '$FROM', To => '$TO', Subject => '$SUBJECT', Type => 'application/vnd.ms-excel', Path => '$FILE')->send()" +rm $FILE Property changes on: branches/xml-class-rework/projects/bos/statistics/mail-stats.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native

1 0

[bknr-cvs] r2005 - in branches/xml-class-rework/thirdparty: . cl-base64
by bknr＠bknr.net 15 Oct '06

15 Oct '06

Author: hhubner Date: 2006-10-15 19:21:43 -0400 (Sun, 15 Oct 2006) New Revision: 2005 Added: branches/xml-class-rework/thirdparty/cl-base64/ branches/xml-class-rework/thirdparty/cl-base64/COPYING branches/xml-class-rework/thirdparty/cl-base64/cl-base64.asd branches/xml-class-rework/thirdparty/cl-base64/decode.lisp branches/xml-class-rework/thirdparty/cl-base64/encode.lisp branches/xml-class-rework/thirdparty/cl-base64/package.lisp branches/xml-class-rework/thirdparty/cl-base64/tests.lisp Log: Import cl-base64-3.3.2 Added: branches/xml-class-rework/thirdparty/cl-base64/COPYING =================================================================== --- branches/xml-class-rework/thirdparty/cl-base64/COPYING 2006-10-15 23:20:32 UTC (rev 2004) +++ branches/xml-class-rework/thirdparty/cl-base64/COPYING 2006-10-15 23:21:43 UTC (rev 2005) @@ -0,0 +1,26 @@ +Copyright (c) 2002-2003 by Kevin Rosenberg + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the Authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Added: branches/xml-class-rework/thirdparty/cl-base64/cl-base64.asd =================================================================== --- branches/xml-class-rework/thirdparty/cl-base64/cl-base64.asd 2006-10-15 23:20:32 UTC (rev 2004) +++ branches/xml-class-rework/thirdparty/cl-base64/cl-base64.asd 2006-10-15 23:21:43 UTC (rev 2005) @@ -0,0 +1,46 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: cl-base64.asd +;;;; Purpose: ASDF definition file for Cl-Base64 +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Dec 2002 +;;;; +;;;; $Id: cl-base64.asd 11051 2006-08-27 18:23:13Z kevin $ +;;;; ************************************************************************* + +(in-package #:cl-user) +(defpackage #:cl-base64-system (:use #:asdf #:cl)) +(in-package #:cl-base64-system) + + +(defsystem cl-base64 + :name "cl-base64" + :author "Kevin M. Rosenberg based on initial code by Juri Pakaste" + :version "3.1" + :maintainer "Kevin M. Rosenberg <kmr(a)debian.org>" + :licence "BSD-style" + :description "Base64 encoding and decoding with URI support." + + :components + ((:file "package") + (:file "encode" :depends-on ("package")) + (:file "decode" :depends-on ("package")) + )) + +(defmethod perform ((o test-op) (c (eql (find-system 'cl-base64)))) + (operate 'load-op 'cl-base64-tests) + (operate 'test-op 'cl-base64-tests :force t)) + +(defsystem cl-base64-tests + :depends-on (cl-base64 ptester kmrcl) + + :components + ((:file "tests"))) + +(defmethod perform ((o test-op) (c (eql (find-system 'cl-base64-tests)))) + (operate 'load-op 'cl-base64-tests) + (or (funcall (intern (symbol-name '#:do-tests) + (find-package '#:cl-base64-tests))) + (error "test-op failed"))) Added: branches/xml-class-rework/thirdparty/cl-base64/decode.lisp =================================================================== --- branches/xml-class-rework/thirdparty/cl-base64/decode.lisp 2006-10-15 23:20:32 UTC (rev 2004) +++ branches/xml-class-rework/thirdparty/cl-base64/decode.lisp 2006-10-15 23:21:43 UTC (rev 2005) @@ -0,0 +1,256 @@ +;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: encode.lisp +;;;; Purpose: cl-base64 encoding routines +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Dec 2002 +;;;; +;;;; $Id: decode.lisp 7061 2003-09-07 06:34:45Z kevin $ +;;;; +;;;; This file implements the Base64 transfer encoding algorithm as +;;;; defined in RFC 1521 by Borensten & Freed, September 1993. +;;;; See: http://www.ietf.org/rfc/rfc1521.txt +;;;; +;;;; Based on initial public domain code by Juri Pakaste <juri(a)iki.fi> +;;;; +;;;; Copyright 2002-2003 Kevin M. Rosenberg +;;;; Permission to use with BSD-style license included in the COPYING file +;;;; ************************************************************************* + +(in-package #:cl-base64) + +(declaim (inline whitespace-p)) +(defun whitespace-p (c) + "Returns T for a whitespace character." + (or (char= c #\Newline) (char= c #\Linefeed) + (char= c #\Return) (char= c #\Space) + (char= c #\Tab))) + + +;;; Decoding + +#+ignore +(defmacro def-base64-stream-to-* (output-type) + `(defun ,(intern (concatenate 'string (symbol-name :base64-stream-to-) + (symbol-name output-type))) + (input &key (uri nil) + ,@(when (eq output-type :stream) + '(stream))) + ,(concatenate 'string "Decode base64 stream to " (string-downcase + (symbol-name output-type))) + (declare (stream input) + (optimize (speed 3) (space 0) (safety 0))) + (let ((pad (if uri *uri-pad-char* *pad-char*)) + (decode-table (if uri *uri-decode-table* *decode-table*))) + (declare (type decode-table decode-table) + (type character pad)) + (let (,@(case output-type + (:string + '((result (make-string (* 3 (truncate (length string) 4)))))) + (:usb8-array + '((result (make-array (* 3 (truncate (length string) 4)) + :element-type '(unsigned-byte 8) + :fill-pointer nil + :adjustable nil))))) + (ridx 0)) + (declare ,@(case output-type + (:string + '((simple-string result))) + (:usb8-array + '((type (simple-array (usigned-byte 8) (*)) result)))) + (fixnum ridx)) + (do* ((bitstore 0) + (bitcount 0) + (char (read-char stream nil #\null) + (read-char stream nil #\null))) + ((eq char #\null) + ,(case output-type + (:stream + 'stream) + ((:string :usb8-array) + 'result) + ;; ((:stream :string) + ;; '(subseq result 0 ridx)))) + )) + (declare (fixnum bitstore bitcount) + (character char)) + (let ((svalue (aref decode-table (the fixnum (char-code char))))) + (declare (fixnum svalue)) + (cond + ((>= svalue 0) + (setf bitstore (logior + (the fixnum (ash bitstore 6)) + svalue)) + (incf bitcount 6) + (when (>= bitcount 8) + (decf bitcount 8) + (let ((ovalue (the fixnum + (logand + (the fixnum + (ash bitstore + (the fixnum (- bitcount)))) + #xFF)))) + (declare (fixnum ovalue)) + ,(case output-type + (:string + '(setf (char result ridx) (code-char ovalue))) + (:usb8-array + '(setf (aref result ridx) ovalue)) + (:stream + '(write-char (code-char ovalue) stream))) + (incf ridx) + (setf bitstore (the fixnum (logand bitstore #xFF)))))) + ((char= char pad) + ;; Could add checks to make sure padding is correct + ;; Currently, padding is ignored + ) + ((whitespace-p char) + ;; Ignore whitespace + ) + ((minusp svalue) + (warn "Bad character ~W in base64 decode" char)) + ))))))) + +;;(def-base64-stream-to-* :string) +;;(def-base64-stream-to-* :stream) +;;(def-base64-stream-to-* :usb8-array) + +(defmacro def-base64-string-to-* (output-type) + `(defun ,(intern (concatenate 'string (symbol-name :base64-string-to-) + (symbol-name output-type))) + (input &key (uri nil) + ,@(when (eq output-type :stream) + '(stream))) + ,(concatenate 'string "Decode base64 string to " (string-downcase + (symbol-name output-type))) + (declare (string input) + (optimize (speed 3) (safety 0) (space 0))) + (let ((pad (if uri *uri-pad-char* *pad-char*)) + (decode-table (if uri *uri-decode-table* *decode-table*))) + (declare (type decode-table decode-table) + (type character pad)) + (let (,@(case output-type + (:string + '((result (make-string (* 3 (truncate (length input) 4)))))) + (:usb8-array + '((result (make-array (* 3 (truncate (length input) 4)) + :element-type '(unsigned-byte 8) + :fill-pointer nil + :adjustable nil))))) + (ridx 0)) + (declare ,@(case output-type + (:string + '((simple-string result))) + (:usb8-array + '((type (simple-array (unsigned-byte 8) (*)) result)))) + (fixnum ridx)) + (loop + for char of-type character across input + for svalue of-type fixnum = (aref decode-table + (the fixnum (char-code char))) + with bitstore of-type fixnum = 0 + with bitcount of-type fixnum = 0 + do + (cond + ((>= svalue 0) + (setf bitstore (logior + (the fixnum (ash bitstore 6)) + svalue)) + (incf bitcount 6) + (when (>= bitcount 8) + (decf bitcount 8) + (let ((ovalue (the fixnum + (logand + (the fixnum + (ash bitstore + (the fixnum (- bitcount)))) + #xFF)))) + (declare (fixnum ovalue)) + ,(case output-type + (:string + '(setf (char result ridx) (code-char ovalue))) + (:usb8-array + '(setf (aref result ridx) ovalue)) + (:stream + '(write-char (code-char ovalue) stream))) + (incf ridx) + (setf bitstore (the fixnum (logand bitstore #xFF)))))) + ((char= char pad) + ;; Could add checks to make sure padding is correct + ;; Currently, padding is ignored + ) + ((whitespace-p char) + ;; Ignore whitespace + ) + ((minusp svalue) + (warn "Bad character ~W in base64 decode" char)) + )) + ,(case output-type + (:stream + 'stream) + ((:usb8-array :string) + '(subseq result 0 ridx))))))) + +(def-base64-string-to-* :string) +(def-base64-string-to-* :stream) +(def-base64-string-to-* :usb8-array) + +;; input-mode can be :string or :stream +;; input-format can be :character or :usb8 + +(defun base64-string-to-integer (string &key (uri nil)) + "Decodes a base64 string to an integer" + (declare (string string) + (optimize (speed 3) (safety 0) (space 0))) + (let ((pad (if uri *uri-pad-char* *pad-char*)) + (decode-table (if uri *uri-decode-table* *decode-table*))) + (declare (type decode-table decode-table) + (character pad)) + (let ((value 0)) + (declare (integer value)) + (loop + for char of-type character across string + for svalue of-type fixnum = + (aref decode-table (the fixnum (char-code char))) + do + (cond + ((>= svalue 0) + (setq value (+ svalue (ash value 6)))) + ((char= char pad) + (setq value (ash value -2))) + ((whitespace-p char) + ; ignore whitespace + ) + ((minusp svalue) + (warn "Bad character ~W in base64 decode" char)))) + value))) + + +(defun base64-stream-to-integer (stream &key (uri nil)) + "Decodes a base64 string to an integer" + (declare (stream stream) + (optimize (speed 3) (space 0) (safety 0))) + (let ((pad (if uri *uri-pad-char* *pad-char*)) + (decode-table (if uri *uri-decode-table* *decode-table*))) + (declare (type decode-table decode-table) + (character pad)) + (do* ((value 0) + (char (read-char stream nil #\null) + (read-char stream nil #\null))) + ((eq char #\null) + value) + (declare (integer value) + (character char)) + (let ((svalue (aref decode-table (the fixnum (char-code char))))) + (declare (fixnum svalue)) + (cond + ((>= svalue 0) + (setq value (+ svalue (ash value 6)))) + ((char= char pad) + (setq value (ash value -2))) + ((whitespace-p char) ; ignore whitespace + ) + ((minusp svalue) + (warn "Bad character ~W in base64 decode" char))))))) Added: branches/xml-class-rework/thirdparty/cl-base64/encode.lisp =================================================================== --- branches/xml-class-rework/thirdparty/cl-base64/encode.lisp 2006-10-15 23:20:32 UTC (rev 2004) +++ branches/xml-class-rework/thirdparty/cl-base64/encode.lisp 2006-10-15 23:21:43 UTC (rev 2005) @@ -0,0 +1,322 @@ +;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: encode.lisp +;;;; Purpose: cl-base64 encoding routines +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Dec 2002 +;;;; +;;;; $Id: encode.lisp 7061 2003-09-07 06:34:45Z kevin $ +;;;; +;;;; This file implements the Base64 transfer encoding algorithm as +;;;; defined in RFC 1521 by Borensten & Freed, September 1993. +;;;; See: http://www.ietf.org/rfc/rfc1521.txt +;;;; +;;;; Based on initial public domain code by Juri Pakaste <juri(a)iki.fi> +;;;; +;;;; Copyright 2002-2003 Kevin M. Rosenberg +;;;; Permission to use with BSD-style license included in the COPYING file +;;;; ************************************************************************* + +;;;; Extended by Kevin M. Rosenberg <kevin(a)rosenberg.net>: +;;;; - .asd file +;;;; - numerous speed optimizations +;;;; - conversion to and from integers +;;;; - Renamed functions now that supporting integer conversions +;;;; - URI-compatible encoding using :uri key +;;;; +;;;; $Id: encode.lisp 7061 2003-09-07 06:34:45Z kevin $ + +(in-package #:cl-base64) + +(defun round-next-multiple (x n) + "Round x up to the next highest multiple of n." + (declare (fixnum n) + (optimize (speed 3) (safety 0) (space 0))) + (let ((remainder (mod x n))) + (declare (fixnum remainder)) + (if (zerop remainder) + x + (the fixnum (+ x (the fixnum (- n remainder))))))) + +(defmacro def-*-to-base64-* (input-type output-type) + `(defun ,(intern (concatenate 'string (symbol-name input-type) + (symbol-name :-to-base64-) + (symbol-name output-type))) + (input + ,@(when (eq output-type :stream) + '(output)) + &key (uri nil) (columns 0)) + "Encode a string array to base64. If columns is > 0, designates +maximum number of columns in a line and the string will be terminated +with a #\Newline." + (declare ,@(case input-type + (:string + '((string input))) + (:usb8-array + '((type (array (unsigned-byte 8) (*)) input)))) + (fixnum columns) + (optimize (speed 3) (safety 0) (space 0))) + (let ((pad (if uri *uri-pad-char* *pad-char*)) + (encode-table (if uri *uri-encode-table* *encode-table*))) + (declare (simple-string encode-table) + (character pad)) + (let* ((string-length (length input)) + (complete-group-count (truncate string-length 3)) + (remainder (nth-value 1 (truncate string-length 3))) + (padded-length (* 4 (truncate (+ string-length 2) 3))) + ,@(when (eq output-type :string) + '((num-lines (if (plusp columns) + (truncate (+ padded-length (1- columns)) columns) + 0)) + (num-breaks (if (plusp num-lines) + (1- num-lines) + 0)) + (strlen (+ padded-length num-breaks)) + (result (make-string strlen)) + (ioutput 0))) + (col (if (plusp columns) + 0 + (the fixnum (1+ padded-length))))) + (declare (fixnum string-length padded-length col + ,@(when (eq output-type :string) + '(ioutput))) + ,@(when (eq output-type :string) + '((simple-string result)))) + (labels ((output-char (ch) + (if (= col columns) + (progn + ,@(case output-type + (:stream + '((write-char #\Newline output))) + (:string + '((setf (schar result ioutput) #\Newline) + (incf ioutput)))) + (setq col 1)) + (incf col)) + ,@(case output-type + (:stream + '((write-char ch output))) + (:string + '((setf (schar result ioutput) ch) + (incf ioutput))))) + (output-group (svalue chars) + (declare (fixnum svalue chars)) + (output-char + (schar encode-table + (the fixnum + (logand #x3f + (the fixnum (ash svalue -18)))))) + (output-char + (schar encode-table + (the fixnum + (logand #x3f + (the fixnum (ash svalue -12)))))) + (if (> chars 2) + (output-char + (schar encode-table + (the fixnum + (logand #x3f + (the fixnum (ash svalue -6)))))) + (output-char pad)) + (if (> chars 3) + (output-char + (schar encode-table + (the fixnum + (logand #x3f svalue)))) + (output-char pad)))) + (do ((igroup 0 (the fixnum (1+ igroup))) + (isource 0 (the fixnum (+ isource 3)))) + ((= igroup complete-group-count) + (cond + ((= remainder 2) + (output-group + (the fixnum + (+ + (the fixnum + (ash + ,(case input-type + (:string + '(char-code (the character (char input isource)))) + (:usb8-array + '(the fixnum (aref input isource)))) + 16)) + (the fixnum + (ash + ,(case input-type + (:string + '(char-code (the character (char input + (the fixnum (1+ isource)))))) + (:usb8-array + '(the fixnum (aref input (the fixnum + (1+ isource)))))) + 8)))) + 3)) + ((= remainder 1) + (output-group + (the fixnum + (ash + ,(case input-type + (:string + '(char-code (the character (char input isource)))) + (:usb8-array + '(the fixnum (aref input isource)))) + 16)) + 2))) + ,(case output-type + (:string + 'result) + (:stream + 'output))) + (declare (fixnum igroup isource)) + (output-group + (the fixnum + (+ + (the fixnum + (ash + (the fixnum + ,(case input-type + (:string + '(char-code (the character (char input isource)))) + (:usb8-array + '(aref input isource)))) + 16)) + (the fixnum + (ash + (the fixnum + ,(case input-type + (:string + '(char-code (the character (char input + (the fixnum (1+ isource)))))) + (:usb8-array + '(aref input (1+ isource))))) + 8)) + (the fixnum + ,(case input-type + (:string + '(char-code (the character (char input + (the fixnum (+ 2 isource)))))) + (:usb8-array + '(aref input (+ 2 isource)))) + ))) + 4))))))) + +(def-*-to-base64-* :string :string) +(def-*-to-base64-* :string :stream) +(def-*-to-base64-* :usb8-array :string) +(def-*-to-base64-* :usb8-array :stream) + + +(defun integer-to-base64-string (input &key (uri nil) (columns 0)) + "Encode an integer to base64 format." + (declare (integer input) + (fixnum columns) + (optimize (speed 3) (space 0) (safety 0))) + (let ((pad (if uri *uri-pad-char* *pad-char*)) + (encode-table (if uri *uri-encode-table* *encode-table*))) + (declare (simple-string encode-table) + (character pad)) + (let* ((input-bits (integer-length input)) + (byte-bits (round-next-multiple input-bits 8)) + (padded-bits (round-next-multiple byte-bits 6)) + (remainder-padding (mod padded-bits 24)) + (padding-bits (if (zerop remainder-padding) + 0 + (- 24 remainder-padding))) + (padding-chars (/ padding-bits 6)) + (padded-length (/ (+ padded-bits padding-bits) 6)) + (last-line-len (if (plusp columns) + (- padded-length (* columns + (truncate + padded-length columns))) + 0)) + (num-lines (if (plusp columns) + (truncate (+ padded-length (1- columns)) columns) + 0)) + (num-breaks (if (plusp num-lines) + (1- num-lines) + 0)) + (strlen (+ padded-length num-breaks)) + (last-char (1- strlen)) + (str (make-string strlen)) + (col (if (zerop last-line-len) + columns + last-line-len))) + (declare (fixnum padded-length num-lines col last-char + padding-chars last-line-len)) + (unless (plusp columns) + (setq col -1)) ;; set to flag to optimize in loop + + (dotimes (i padding-chars) + (declare (fixnum i)) + (setf (schar str (the fixnum (- last-char i))) pad)) + + (do* ((strpos (- last-char padding-chars) (1- strpos)) + (int (ash input (/ padding-bits 3)))) + ((minusp strpos) + str) + (declare (fixnum strpos) (integer int)) + (cond + ((zerop col) + (setf (schar str strpos) #\Newline) + (setq col columns)) + (t + (setf (schar str strpos) + (schar encode-table (the fixnum (logand int #x3f)))) + (setq int (ash int -6)) + (decf col))))))) + +(defun integer-to-base64-stream (input stream &key (uri nil) (columns 0)) + "Encode an integer to base64 format." + (declare (integer input) + (fixnum columns) + (optimize (speed 3) (space 0) (safety 0))) + (let ((pad (if uri *uri-pad-char* *pad-char*)) + (encode-table (if uri *uri-encode-table* *encode-table*))) + (declare (simple-string encode-table) + (character pad)) + (let* ((input-bits (integer-length input)) + (byte-bits (round-next-multiple input-bits 8)) + (padded-bits (round-next-multiple byte-bits 6)) + (remainder-padding (mod padded-bits 24)) + (padding-bits (if (zerop remainder-padding) + 0 + (- 24 remainder-padding))) + (padding-chars (/ padding-bits 6)) + (padded-length (/ (+ padded-bits padding-bits) 6)) + (strlen padded-length) + (nonpad-chars (- strlen padding-chars)) + (last-nonpad-char (1- nonpad-chars)) + (str (make-string strlen))) + (declare (fixnum padded-length last-nonpad-char)) + (do* ((strpos 0 (the fixnum (1+ strpos))) + (int (ash input (/ padding-bits 3)) (ash int -6)) + (6bit-value (the fixnum (logand int #x3f)) + (the fixnum (logand int #x3f)))) + ((= strpos nonpad-chars) + (let ((col 0)) + (declare (fixnum col)) + (dotimes (i nonpad-chars) + (declare (fixnum i)) + (write-char (schar str i) stream) + (when (plusp columns) + (incf col) + (when (= col columns) + (write-char #\Newline stream) + (setq col 0)))) + (dotimes (ipad padding-chars) + (declare (fixnum ipad)) + (write-char pad stream) + (when (plusp columns) + (incf col) + (when (= col columns) + (write-char #\Newline stream) + (setq col 0))))) + stream) + (declare (fixnum 6bit-value strpos) + (integer int)) + (setf (schar str (- last-nonpad-char strpos)) + (schar encode-table 6bit-value)) + )))) + Added: branches/xml-class-rework/thirdparty/cl-base64/package.lisp =================================================================== --- branches/xml-class-rework/thirdparty/cl-base64/package.lisp 2006-10-15 23:20:32 UTC (rev 2004) +++ branches/xml-class-rework/thirdparty/cl-base64/package.lisp 2006-10-15 23:21:43 UTC (rev 2005) @@ -0,0 +1,71 @@ +;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: package.lisp +;;;; Purpose: Package definition for cl-base64 +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Dec 2002 +;;;; +;;;; $Id: package.lisp 7061 2003-09-07 06:34:45Z kevin $ +;;;; +;;;; ************************************************************************* + +(defpackage #:cl-base64 + (:nicknames #:base64) + (:use #:cl) + (:export #:base64-stream-to-integer + #:base64-string-to-integer + #:base64-string-to-string + #:base64-stream-to-string + #:base64-string-to-stream + #:base64-stream-to-stream + #:base64-string-to-usb8-array + #:base64-stream-to-usb8-array + #:string-to-base64-string + #:string-to-base64-stream + #:usb8-array-to-base64-string + #:usb8-array-to-base64-stream + #:stream-to-base64-string + #:stream-to-base64-stream + #:integer-to-base64-string + #:integer-to-base64-stream + + ;; For creating custom encode/decode tables + #:*uri-encode-table* + #:*uri-decode-table* + #:make-decode-table + + #:test-base64 + )) + +(in-package #:cl-base64) + + +(defvar *encode-table* + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/") +(declaim (type simple-string *encode-table*)) + +(defvar *uri-encode-table* + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_") +(declaim (type simple-string *uri-encode-table*)) + +(deftype decode-table () '(simple-array fixnum (256))) + +(defun make-decode-table (encode-table) + (let ((dt (make-array 256 :adjustable nil :fill-pointer nil + :element-type 'fixnum + :initial-element -1))) + (declare (type decode-table dt)) + (loop for char of-type character across encode-table + for index of-type fixnum from 0 below 64 + do (setf (aref dt (the fixnum (char-code char))) index)) + dt)) + +(defvar *decode-table* (make-decode-table *encode-table*)) + +(defvar *uri-decode-table* (make-decode-table *uri-encode-table*)) + +(defvar *pad-char* #\=) +(defvar *uri-pad-char* #\.) +(declaim (type character *pad-char* *uri-pad-char*)) Added: branches/xml-class-rework/thirdparty/cl-base64/tests.lisp =================================================================== --- branches/xml-class-rework/thirdparty/cl-base64/tests.lisp 2006-10-15 23:20:32 UTC (rev 2004) +++ branches/xml-class-rework/thirdparty/cl-base64/tests.lisp 2006-10-15 23:21:43 UTC (rev 2005) @@ -0,0 +1,79 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: test.lisp +;;;; Purpose: Regression tests for cl-base64 +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Jan 2003 +;;;; +;;;; $Id: tests.lisp 9055 2004-04-18 16:49:36Z kevin $ +;;;; ************************************************************************* + +(in-package #:cl-user) + +(defpackage #:cl-base64-tests + (:use #:cl #:kmrcl #:cl-base64 #:ptester)) + +(in-package #:cl-base64-tests) + +(defun do-tests () + (with-tests (:name "cl-base64 tests") + (let ((*break-on-test-failures* t)) + (do* ((length 0 (+ 3 length)) + (string (make-string length) (make-string length)) + (usb8 (make-usb8-array length) (make-usb8-array length)) + (integer (random (expt 10 length)) (random (expt 10 length)))) + ((>= length 300)) + (dotimes (i length) + (declare (fixnum i)) + (let ((code (random 256))) + (setf (schar string i) (code-char code)) + (setf (aref usb8 i) code))) + + (do* ((columns 0 (+ columns 4))) + ((> columns length)) + ;; Test against cl-base64 routines + (test integer (base64-string-to-integer + (integer-to-base64-string integer :columns columns))) + (test string (base64-string-to-string + (string-to-base64-string string :columns columns)) + :test #'string=) + + ;; Test against AllegroCL built-in routines + #+allegro + (progn + (test integer (excl:base64-string-to-integer + (integer-to-base64-string integer :columns columns))) + (test integer (base64-string-to-integer + (excl:integer-to-base64-string integer))) + (test (string-to-base64-string string :columns columns) + (excl:usb8-array-to-base64-string usb8 + (if (zerop columns) + nil + columns)) + :test #'string=) + (test string (base64-string-to-string + (excl:usb8-array-to-base64-string + usb8 + (if (zerop columns) + nil + columns))) + :test #'string=)))))) + t) + + +(defun time-routines () + (let* ((str "abcdefghijklmnopqwertyu1234589jhwf2ff") + (usb8 (string-to-usb8-array str)) + (int 12345678901234567890) + (n 50000)) + (time-iterations n (integer-to-base64-string int)) + (time-iterations n (string-to-base64-string str)) + #+allego + (progn + (time-iterations n (excl:integer-to-base64-string int)) + (time-iterations n (excl:usb8-array-to-base64-string usb8))))) + + +;;#+run-test (test-base64)

1 0

[bknr-cvs] r2004 - in branches/xml-class-rework/thirdparty: . cl-qprint
by bknr＠bknr.net 15 Oct '06

15 Oct '06

Author: hhubner Date: 2006-10-15 19:20:32 -0400 (Sun, 15 Oct 2006) New Revision: 2004 Added: branches/xml-class-rework/thirdparty/cl-qprint/ branches/xml-class-rework/thirdparty/cl-qprint/COPYING branches/xml-class-rework/thirdparty/cl-qprint/base.lisp branches/xml-class-rework/thirdparty/cl-qprint/cl-qprint.asd Log: Import cl-qprint-0.2.0.tar.gz Added: branches/xml-class-rework/thirdparty/cl-qprint/COPYING =================================================================== --- branches/xml-class-rework/thirdparty/cl-qprint/COPYING 2006-10-15 22:28:24 UTC (rev 2003) +++ branches/xml-class-rework/thirdparty/cl-qprint/COPYING 2006-10-15 23:20:32 UTC (rev 2004) @@ -0,0 +1,497 @@ + Preamble to the Gnu Lesser General Public License + + +Copyright (c) 2000 Franz Incorporated, Berkeley, CA 94704 + +The concept of the GNU Lesser General Public License version 2.1 +("LGPL") has been adopted to govern the use and distribution of +above-mentioned application. However, the LGPL uses terminology that +is more appropriate for a program written in C than one written in +Lisp. Nevertheless, the LGPL can still be applied to a Lisp program if +certain clarifications are made. This document details those +clarifications. Accordingly, the license for the open-source Lisp +applications consists of this document plus the LGPL. Wherever there +is a conflict between this document and the LGPL, this document takes +precedence over the LGPL. + +A "Library" in Lisp is a collection of Lisp functions, data and +foreign modules. The form of the Library can be Lisp source code (for +processing by an interpreter) or object code (usually the result of +compilation of source code or built with some other +mechanisms). Foreign modules are object code in a form that can be +linked into a Lisp executable. When we speak of functions we do so in +the most general way to include, in addition, methods and unnamed +functions. Lisp "data" is also a general term that includes the data +structures resulting from defining Lisp classes. A Lisp application +may include the same set of Lisp objects as does a Library, but this +does not mean that the application is necessarily a "work based on the +Library" it contains. + +The Library consists of everything in the distribution file set before +any modifications are made to the files. If any of the functions or +classes in the Library are redefined in other files, then those +redefinitions ARE considered a work based on the Library. If +additional methods are added to generic functions in the Library, +those additional methods are NOT considered a work based on the +Library. If Library classes are subclassed, these subclasses are NOT +considered a work based on the Library. If the Library is modified to +explicitly call other functions that are neither part of Lisp itself +nor an available add-on module to Lisp, then the functions called by +the modified Library ARE considered a work based on the Library. The +goal is to ensure that the Library will compile and run without +getting undefined function errors. + +It is permitted to add proprietary source code to the Library, but it +must be done in a way such that the Library will still run without +that proprietary code present. Section 5 of the LGPL distinguishes +between the case of a library being dynamically linked at runtime and +one being statically linked at build time. Section 5 of the LGPL +states that the former results in an executable that is a "work that +uses the Library." Section 5 of the LGPL states that the latter +results in one that is a "derivative of the Library", which is +therefore covered by the LGPL. Since Lisp only offers one choice, +which is to link the Library into an executable at build time, we +declare that, for the purpose applying the LGPL to the Library, an +executable that results from linking a "work that uses the Library" +with the Library is considered a "work that uses the Library" and is +therefore NOT covered by the LGPL. + +Because of this declaration, section 6 of LGPL is not applicable to +the Library. However, in connection with each distribution of this +executable, you must also deliver, in accordance with the terms and +conditions of the LGPL, the source code of Library (or your derivative +thereof) that is incorporated into this executable. + + + + +Preamble + +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public Licenses +are intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. + +This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library, or if you modify it. + +For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + +Our method of protecting your rights has two steps: (1) copyright the +library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + +Also, for each distributor's protection, we want to make certain that +everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + +Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + +Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License, which was designed for utility +programs. This license, the GNU Library General Public License, +applies to certain designated libraries. This license is quite +different from the ordinary one; be sure to read it in full, and don't +assume that anything in it is the same as in the ordinary license. + +The reason we have a separate public license for some libraries is +that they blur the distinction we usually make between modifying or +adding to a program and simply using it. Linking a program with a +library, without changing the library, is in some sense simply using +the library, and is analogous to running a utility program or +application program. However, in a textual and legal sense, the linked +executable is a combined work, a derivative of the original library, +and the ordinary General Public License treats it as such. + +Because of this blurred distinction, using the ordinary General Public +License for libraries did not effectively promote software sharing, +because most developers did not use the libraries. We concluded that +weaker conditions might promote sharing better. + +However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended +to permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to +achieve this as regards changes in header files, but we have achieved +it as regards changes in the actual functions of the Library.) The +hope is that this will lead to faster development of free libraries. + +The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + +Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. TERMS AND +CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License Agreement applies to any software library which + contains a notice placed by the copyright holder or other + authorized party saying it may be distributed under the terms of + this Library General Public License (also called "this + License"). Each licensee is addressed as "you". + +A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does and +what the program that uses the Library does. + +1. You may copy and distribute verbatim copies of the Library's + complete source code as you receive it, in any medium, provided + that you conspicuously and appropriately publish on each copy an + appropriate copyright notice and disclaimer of warranty; keep + intact all the notices that refer to this License and to the + absence of any warranty; and distribute a copy of this License + along with the Library. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a +fee. + +2. You may modify your copy or copies of the Library or any portion of + it, thus forming a work based on the Library, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + * a) The modified work must itself be a software library. + + * b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + * c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + +* d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses the + facility, other than as an argument passed when the facility is + invoked, then you must make a good faith effort to ensure that, in + the event an application does not supply such function or table, the + facility still operates, and performs whatever part of its purpose + remains meaningful. (For example, a function in a library to compute + square roots has a purpose that is entirely well-defined independent + of the application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must be + optional: if the application does not supply it, the square root + function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +3. You may opt to apply the terms of the ordinary GNU General Public + License instead of this License to a given copy of the Library. To + do this, you must alter all the notices that refer to this License, + so that they refer to the ordinary GNU General Public License, + version 2, instead of to this License. (If a newer version than + version 2 of the ordinary GNU General Public License has appeared, + then you can specify that version instead if you wish.) Do not make + any other change in these notices. + +Once this change is made in a given copy, it is irreversible for that +copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the +Library into a program that is not a library. + +4. You may copy and distribute the Library (or a portion or derivative + of it, under Section 2) in object code or executable form under the + terms of Sections 1 and 2 above provided that you accompany it with + the complete corresponding machine-readable source code, which must + be distributed under the terms of Sections 1 and 2 above on a + medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from +a designated place, then offering equivalent access to copy the source +code from the same place satisfies the requirement to distribute the +source code, even though third parties are not compelled to copy the +source along with the object code. + +5. A program that contains no derivative of any portion of the + Library, but is designed to work with the Library by being compiled + or linked with it, is called a "work that uses the Library". Such a + work, in isolation, is not a derivative work of the Library, and + therefore falls outside the scope of this License. + +However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. Section +6 states terms for distribution of such executables. + +When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is +not. Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data structure +layouts and accessors, and small macros and small inline functions +(ten lines or less in length), then the use of the object file is +unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section +6. Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +6. As an exception to the Sections above, you may also compile or link + a "work that uses the Library" with the Library to produce a work + containing portions of the Library, and distribute that work under + terms of your choice, provided that the terms permit modification + of the work for the customer's own use and reverse engineering for + debugging such modifications. + +You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + * a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable + linked with the Library, with the complete machine-readable + "work that uses the Library", as object code and/or source code, + so that the user can modify the Library and then relink to + produce a modified executable containing the modified + Library. (It is understood that the user who changes the + contents of definitions files in the Library will not + necessarily be able to recompile the application to use the + modified definitions.) + + * b) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + * c) If distribution of the work is made by offering access to + copy from a designated place, offer equivalent access to copy + the above specified materials from the same place. + +* d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + +For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + +It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + +7. You may place library facilities that are a work based on the + Library side-by-side in a single library together with other + library facilities not covered by this License, and distribute such + a combined library, provided that the separate distribution of the + work based on the Library and of the other library facilities is + otherwise permitted, and provided that you do these two things: + + * a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + +* b) Give prominent notice with the combined library of the fact that + part of it is a work based on the Library, and explaining where to + find the accompanying uncombined form of the same work. + +8. You may not copy, modify, sublicense, link with, or distribute the + Library except as expressly provided under this License. Any + attempt otherwise to copy, modify, sublicense, link with, or + distribute the Library is void, and will automatically terminate + your rights under this License. However, parties who have received + copies, or rights, from you under this License will not have their + licenses terminated so long as such parties remain in full + compliance. + +9. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Library or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Library (or any work based on the + Library), you indicate your acceptance of this License to do so, + and all its terms and conditions for copying, distributing or + modifying the Library or works based on it. + +10. Each time you redistribute the Library (or any work based on the + Library), the recipient automatically receives a license from the + original licensor to copy, distribute, link with or modify the + Library subject to these terms and conditions. You may not impose + any further restrictions on the recipients' exercise of the rights + granted herein. You are not responsible for enforcing compliance + by third parties to this License. + +11. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent + issues), conditions are imposed on you (whether by court order, + agreement or otherwise) that contradict the conditions of this + License, they do not excuse you from the conditions of this + License. If you cannot distribute so as to satisfy simultaneously + your obligations under this License and any other pertinent + obligations, then as a consequence you may not distribute the + Library at all. For example, if a patent license would not permit + royalty-free redistribution of the Library by all those who + receive copies directly or indirectly through you, then the only + way you could satisfy both it and this License would be to refrain + entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in + certain countries either by patents or by copyrighted interfaces, + the original copyright holder who places the Library under this + License may add an explicit geographical distribution limitation + excluding those countries, so that distribution is permitted only + in or among countries not thus excluded. In such case, this + License incorporates the limitation as if written in the body of + this License. + +13. The Free Software Foundation may publish revised and/or new + versions of the Library General Public License from time to + time. Such new versions will be similar in spirit to the present + version, but may differ in detail to address new problems or + concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free + programs whose distribution conditions are incompatible with + these, write to the author to ask for permission. For software + which is copyrighted by the Free Software Foundation, write to the + Free Software Foundation; we sometimes make exceptions for + this. Our decision will be guided by the two goals of preserving + the free status of all derivatives of our free software and of + promoting the sharing and reuse of software generally. + +NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE + LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS + AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY + OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND + PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE + DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR + OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY + MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE + LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, + INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR + INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU + OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY + OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + Added: branches/xml-class-rework/thirdparty/cl-qprint/base.lisp =================================================================== --- branches/xml-class-rework/thirdparty/cl-qprint/base.lisp 2006-10-15 22:28:24 UTC (rev 2003) +++ branches/xml-class-rework/thirdparty/cl-qprint/base.lisp 2006-10-15 23:20:32 UTC (rev 2004) @@ -0,0 +1,124 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;; base.lisp: The Program +;;;; Copyright (C) 2004 Robert Marlow <rob(a)bobturf.org> +;;;; +;;;; This library is free software; you can redistribute it and/or +;;;; modify it under the terms of the GNU Library General Public +;;;; License as published by the Free Software Foundation; either +;;;; version 2 of the License, or (at your option) any later version. +;;;; +;;;; This library is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;;; Library General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU Library General Public +;;;; License along with this library; if not, write to the +;;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;;;; Boston, MA 02111-1307, USA. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + +(defpackage cl-qprint + (:use :cl) + (:nicknames :qprint) + (:export :encode + :decode)) + + +(in-package :cl-qprint) + +(defun decode (input) + "INPUT must be a string or a stream. Reads quoted-printable encoding +from INPUT and produces the equivalent decoded string" + (let ((out-stream (make-string-output-stream)) + (in-stream + (typecase input + (string (make-string-input-stream input)) + (stream input)))) + (do ((char (read-char in-stream nil 'eof) + (read-char in-stream nil 'eof))) + ((eql char 'eof) + (get-output-stream-string out-stream)) + (princ (if (char= char #\=) + (let ((char2 (read-char in-stream))) + ;; Check for and convert all newlines (LF or CRLF) + ;; to nothing. The = indicates a soft line break. + (if (member char2 '(#\return #\linefeed) + :test #'char=) + (let ((char3 (read-char in-stream nil 'eof))) + (cond + ((eql char3 'eof) "") + ((and (char= char3 #\linefeed) + (char= char2 #\return)) "") + (t char3))) + ;; If not a newline the = indicates encoding + (code-char (parse-integer + (format nil "~C~C" + char2 + (read-char in-stream nil 'eof)) + :radix 16)))) + char) + out-stream)))) + + +(defun cr-lf (stream) + "Prints a CRLF sequence to STREAM. RFC 2045 mandates CRLF for newlines" + (princ #\return stream) + (princ #\linefeed stream)) + + +(defun encode (input) + "INPUT must be either a string or a stream. Reads from INPUT and produces +a quoted-printable encoded string" + (let ((out-stream (make-string-output-stream)) + (in-stream + (typecase input + (string (make-string-input-stream input)) + (stream input))) + (last-line-break 0) + (ws nil)) + + (do ((c (read-char in-stream nil 'eof) + (read-char in-stream nil 'eof)) + (position 0 (file-position out-stream))) + ((eql c 'eof) + (get-output-stream-string out-stream)) + + ;; Put in a soft line break if the line's gotten too long + (when (>= (- position last-line-break) 74) + (princ #\= out-stream) + (cr-lf out-stream) + (setf last-line-break position)) + + ;; ws on the end of a line must be encoded + (when ws + (if (char= c #\newline) + (format out-stream "=~2,'0X" (char-code ws)) + (princ ws out-stream))) + + (cond + + ;; Ensure newlines are CR-LF + ((char= c #\newline) + (cr-lf out-stream) + (setf last-line-break position)) + + ;; Keep track of whitespace in case of following newlines + ((member c '(#\space #\tab) :test #'char=) + (setf ws c)) + + ;; Encode non-printable characters and = + ((or (char< c #\!) + (char> c #\~) + (char= c #\=)) + (format out-stream "=~2,'0X" (char-code c))) + + ;; Else just print the character. + (t (princ c out-stream))) + + ;; Keep track of whitespace in case we hit a newline + (unless (member c '(#\space #\tab) :test #'char=) + (setf ws nil))))) + + Added: branches/xml-class-rework/thirdparty/cl-qprint/cl-qprint.asd =================================================================== --- branches/xml-class-rework/thirdparty/cl-qprint/cl-qprint.asd 2006-10-15 22:28:24 UTC (rev 2003) +++ branches/xml-class-rework/thirdparty/cl-qprint/cl-qprint.asd 2006-10-15 23:20:32 UTC (rev 2004) @@ -0,0 +1,35 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;; qprint.asd: System Definition +;;;; Copyright (C) 2004 Robert Marlow <rob(a)bobturf.org> +;;;; +;;;; This library is free software; you can redistribute it and/or +;;;; modify it under the terms of the GNU Library General Public +;;;; License as published by the Free Software Foundation; either +;;;; version 2 of the License, or (at your option) any later version. +;;;; +;;;; This library is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;;; Library General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU Library General Public +;;;; License along with this library; if not, write to the +;;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;;;; Boston, MA 02111-1307, USA. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + + +(defpackage :cl-qprint-system + (:use :asdf :cl)) + +(in-package :cl-qprint-system) + +(defsystem :cl-qprint + :name "CL-QPRINT" + :author "Robert Marlow <rob(a)bobturf.org>" + :version "0.2.0" + :maintainer "Robert Marlow <rob(a)bobturf.org>" + :serial t + :components + ((:file "base")))

1 0

[bknr-cvs] r2003 - branches/xml-class-rework/thirdparty/portableaserve/aserve
by bknr＠bknr.net 15 Oct '06

15 Oct '06

Author: hhubner Date: 2006-10-15 18:28:24 -0400 (Sun, 15 Oct 2006) New Revision: 2003 Modified: branches/xml-class-rework/thirdparty/portableaserve/aserve/publish.cl Log: Add svg mime type Modified: branches/xml-class-rework/thirdparty/portableaserve/aserve/publish.cl =================================================================== --- branches/xml-class-rework/thirdparty/portableaserve/aserve/publish.cl 2006-10-15 22:15:06 UTC (rev 2002) +++ branches/xml-class-rework/thirdparty/portableaserve/aserve/publish.cl 2006-10-15 22:28:24 UTC (rev 2003) @@ -427,6 +427,7 @@ ("text/vnd.flatland.3dml") ("text/vnd.fmi.flexstor") ("text/vnd.in3d.3dml") ("text/vnd.in3d.spot") ("text/vnd.latex-z") ("text/x-setext" "etx") ("text/xml" "xml" "xsl") ("video/mpeg" "mpeg" "mpg" "mpe") + ("image/svg+xml" "svg") ("video/quicktime" "qt" "mov") ("video/vnd.motorola.video") ("video/vnd.motorola.videop") ("video/vnd.vivo") ("video/x-msvideo" "avi") ("video/x-sgi-movie" "movie") ("x-conference/x-cooltalk" "ice")

1 0

[bknr-cvs] r2002 - branches/xml-class-rework/projects/bos/statistics
by bknr＠bknr.net 15 Oct '06

15 Oct '06

Author: hhubner Date: 2006-10-15 18:15:06 -0400 (Sun, 15 Oct 2006) New Revision: 2002 Modified: branches/xml-class-rework/projects/bos/statistics/buildSVGLineChart.xsl Log: Add required namespace for SVG images Modified: branches/xml-class-rework/projects/bos/statistics/buildSVGLineChart.xsl =================================================================== --- branches/xml-class-rework/projects/bos/statistics/buildSVGLineChart.xsl 2006-10-15 21:30:30 UTC (rev 2001) +++ branches/xml-class-rework/projects/bos/statistics/buildSVGLineChart.xsl 2006-10-15 22:15:06 UTC (rev 2002) @@ -1,7 +1,8 @@ -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +<xsl:stylesheet xmlns="http://www.w3.org/2000/svg" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/2000/xlink/namespace/" version="1.0"> - <xsl:output omit-xml-declaration="yes"/> + <xsl:output omit-xml-declaration="no"/> <xsl:template match="/graphData"> <xsl:variable name="max"> <xsl:value-of select="maxy"/>

1 0

[bknr-cvs] r2001 - in branches/xml-class-rework/projects/bos: payment-website/static worldpay-test
by bknr＠bknr.net 15 Oct '06

15 Oct '06

Author: hhubner Date: 2006-10-15 17:30:30 -0400 (Sun, 15 Oct 2006) New Revision: 2001 Modified: branches/xml-class-rework/projects/bos/payment-website/static/cms.js branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp Log: Link statistics to admin menu Modified: branches/xml-class-rework/projects/bos/payment-website/static/cms.js =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/static/cms.js 2006-10-15 14:14:22 UTC (rev 2000) +++ branches/xml-class-rework/projects/bos/payment-website/static/cms.js 2006-10-15 21:30:30 UTC (rev 2001) @@ -1,3 +1,5 @@ +// This may look like -*- Java -*-, but it really is ECMAScript + // Formularcheck für Sponsoren-Erzeugung function check_complete_sale() { @@ -2,44 +4,53 @@ - if (document.form.name.value == "") { - alert('Missing name for certificate'); - return false; - } + if (document.form.name.value == "") { + alert('Missing name for certificate'); + return false; + } - if (document.form.numsqm.value == "" - || !document.form.numsqm.value.match(/^\d+$/)) { - alert('Invalid number of square meters'); - document.form.numsqm.focus(); - document.form.numsqm.select(); - return false; - } + if (document.form.numsqm.value == "" + || !document.form.numsqm.value.match(/^\d+$/)) { + alert('Invalid number of square meters'); + document.form.numsqm.focus(); + document.form.numsqm.select(); + return false; + } - if (!document.form.date.value.match(/^[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9][0-9][0-9]$/)) { - alert('Invalid date format, use DD.MM.YYYY'); - return false; - } + if (!document.form.date.value.match(/^[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9][0-9][0-9]$/)) { + alert('Invalid date format, use DD.MM.YYYY'); + return false; + } - var mail_message; + var mail_message; - if (document.form.email.value == "") { - mail_message = 'No welcome email will be sent\n'; - } else { - mail_message = 'Welcome email will be sent to ' + document.form.email.value + '\n'; - } + if (document.form.email.value == "") { + mail_message = 'No welcome email will be sent\n'; + } else { + mail_message = 'Welcome email will be sent to ' + document.form.email.value + '\n'; + } - var send_cert_message; + var send_cert_message; - if (document.form.postaladdress.value.match(/^\s*$/)) { - send_cert_message = 'No printed certificate will be mailed\n'; - } else { - send_cert_message = 'Printed certificate will be mailed to:\n' + document.form.postaladdress.value; - } + if (document.form.postaladdress.value.match(/^\s*$/)) { + send_cert_message = 'No printed certificate will be mailed\n'; + } else { + send_cert_message = 'Printed certificate will be mailed to:\n' + document.form.postaladdress.value; + } - var numsqm = document.form.numsqm.value; - var price = numsqm * 3; + var numsqm = document.form.numsqm.value; + var price = numsqm * 3; - return confirm(numsqm + ' square meters have been bought for ' + price + ' euros\n' - + mail_message - + send_cert_message); + return confirm(numsqm + ' square meters have been bought for ' + price + ' euros\n' + + mail_message + + send_cert_message); } +function statistic_selected () +{ + var select = document.getElementById('selector'); + var stats_name = select[select.options.selectedIndex].value; + document.getElementById('stats').innerHTML + = '<embed src="/images/statistics/' + stats_name + '.svg" width="800" height="600" type="image/svg+xml"></embed>'; + + return true; +} Modified: branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-10-15 14:14:22 UTC (rev 2000) +++ branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-10-15 21:30:30 UTC (rev 2001) @@ -120,6 +120,24 @@ (setf contract (find-if #'contract-pdf-pathname (sponsor-contracts (bknr-request-user req))))) (redirect (format nil "/certificates/~D.pdf" (store-object-id contract)) req)) +(defclass statistics-handler (admin-only-handler prefix-handler) + ()) + +(defmethod handle ((handler statistics-handler) req) + (let ((stats-name (parse-url req))) + (cond + (stats-name + (redirect (format nil "~A.svg" stats-name) req)) + (t + (with-bos-cms-page (req :title "Statistics browser") + (:p + ((:select :id "selector" :onchange "return statistic_selected()") + (dolist (file (directory (merge-pathnames #p"images/statistics/*.svg" *website-directory*))) + (html ((:option :value (pathname-name file)) + (:princ-safe (pathname-name file))))))) + ((:p :id "stats") + ((:embed :src "/images/statistics/all-contracts.svg" :width 800 :height 600 :type "image/svg+xml") ""))))))) + (defclass print-certificate-handler (admin-only-handler object-handler) () (:default-initargs :class 'contract)) @@ -209,6 +227,7 @@ ("/create-contract" create-contract-handler) ("/pay-contract" pay-contract-handler) ("/cancel-contract" cancel-contract-handler) + ("/statistics" statistics-handler) ("/rss" rss-handler) ("/" redirect-handler :to "/index") @@ -220,6 +239,7 @@ :modules '(user images stats) :admin-navigation '(("user" . "user/") ("sponsor" . "edit-sponsor/") + ("statistics" . "statistics/") ("news" . "edit-news/") ("poi" . "edit-poi/") ("languages" . "languages")

1 0

[bknr-cvs] r2000 - in branches/xml-class-rework/projects/bos: payment-website/infosystem worldpay-test
by bknr＠bknr.net 15 Oct '06

15 Oct '06

Author: hhubner Date: 2006-10-15 10:14:22 -0400 (Sun, 15 Oct 2006) New Revision: 2000 Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js branches/xml-class-rework/projects/bos/worldpay-test/boi-handlers.lisp branches/xml-class-rework/projects/bos/worldpay-test/reports-xml-handler.lisp branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp Log: Include more info in XML contracts file. Provide download link for contracts file in admin menu. Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js 2006-10-15 13:42:29 UTC (rev 1999) +++ branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js 2006-10-15 14:14:22 UTC (rev 2000) @@ -8,7 +8,7 @@ // Debugger anzeigen? -var show_debugger = true; +var show_debugger = false; // var http_pfad = "http:// createrainforest.org:8080"; var http_pfad = ""; Modified: branches/xml-class-rework/projects/bos/worldpay-test/boi-handlers.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/boi-handlers.lisp 2006-10-15 13:42:29 UTC (rev 1999) +++ branches/xml-class-rework/projects/bos/worldpay-test/boi-handlers.lisp 2006-10-15 14:14:22 UTC (rev 2000) @@ -4,12 +4,16 @@ (enable-interpol-syntax) (defmacro with-xml-response (req &body body) - `(with-http-response (req *ent* :content-type "text/xml") - (with-http-body (req *ent*) - (let ((*xml-sink* (make-character-stream-sink net.html.generator:*html-stream* :canonical nil))) - (with-xml-output *xml-sink* - (with-element "response" - ,@body)))))) + `(with-http-response (,req *ent* :content-type "text/xml") + (with-query-params (,req download) + (when download + (setf (reply-header-slot-value ,req :content-disposition) + (format nil "attachment; filename=~A" download)))) + (with-http-body (,req *ent*) + (let ((*xml-sink* (make-character-stream-sink net.html.generator:*html-stream* :canonical nil))) + (with-xml-output *xml-sink* + (with-element "response" + ,@body)))))) (defmacro with-xml-error-handler (req &body body) `(handler-case Modified: branches/xml-class-rework/projects/bos/worldpay-test/reports-xml-handler.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/reports-xml-handler.lisp 2006-10-15 13:42:29 UTC (rev 1999) +++ branches/xml-class-rework/projects/bos/worldpay-test/reports-xml-handler.lisp 2006-10-15 14:14:22 UTC (rev 2000) @@ -37,7 +37,10 @@ (defreport all-contracts () (dolist (contract *contracts-to-process*) (with-element "contract" + (attribute "id" (store-object-id contract)) + (attribute "sponsor-id" (store-object-id (contract-sponsor contract))) (attribute "universal-time" (contract-date contract)) + (attribute "paid" (contract-paidp contract)) (attribute "date-time" (format-date-time (contract-date contract) :xml-style t)) (attribute "country" (sponsor-country (contract-sponsor contract))) (attribute "sqm-count" (length (contract-m2s contract)))))) Modified: branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp 2006-10-15 13:42:29 UTC (rev 1999) +++ branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp 2006-10-15 14:14:22 UTC (rev 2000) @@ -63,6 +63,7 @@ (:tr (:td "Show new sponsors (enter count)") (:td (text-field "count" :size 4))) (:tr (:td (submit-button "search" "search"))) + (:tr (:td "") (:td ((:a :href "/reports-xml/all-contracts?download=contracts.xls") "Download complete sponsor DB in XML format"))) (:tr ((:th :colspan "2" :align "left") (:h2 "Create sponsor"))) (:tr (:td "Date (DD.MM.YYYY)")

1 0

[bknr-cvs] r1999 - branches/xml-class-rework/projects/bos/worldpay-test
by bknr＠bknr.net 15 Oct '06

15 Oct '06

Author: hhubner Date: 2006-10-15 09:42:29 -0400 (Sun, 15 Oct 2006) New Revision: 1999 Modified: branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp Log: Mail-Subject ge?\195?\164ndert Modified: branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-10-15 13:28:08 UTC (rev 1998) +++ branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-10-15 13:42:29 UTC (rev 1999) @@ -36,12 +36,12 @@ ((equal "C" transStatus) (setf template-name #?"/$(lang)/sponsor_canceled")) ((< (contract-price contract) *mail-certificate-threshold*) - (mail-request-parameters request (format nil "Spenderdaten - Sponsor-ID ~D Contract-ID ~D" + (mail-request-parameters request (format nil "Online-Spenderdaten - Sponsor-ID ~D Contract-ID ~D" (store-object-id (contract-sponsor contract)) (store-object-id contract))) (setf template-name #?"/$(lang)/quittung")) (t - (mail-request-parameters request (format nil "Spenderdaten - Sponsor-ID ~D Contract-ID ~D" + (mail-request-parameters request (format nil "Online-Spenderdaten - Sponsor-ID ~D Contract-ID ~D" (store-object-id (contract-sponsor contract)) (store-object-id contract))) (when (<= *mail-fiscal-certificate-threshold* (contract-price contract))

1 0