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

[bknr-cvs] hans changed trunk/bknr/
by BKNR Commits 10 Nov '08

10 Nov '08

Revision: 4026 Author: hans URL: http://bknr.net/trac/changeset/4026 resolve conflicts with alexandria U trunk/bknr/datastore/src/data/package.lisp U trunk/bknr/datastore/src/utils/package.lisp U trunk/bknr/datastore/src/utils/utils.lisp U trunk/bknr/modules/text/package.lisp U trunk/bknr/web/src/packages.lisp Modified: trunk/bknr/datastore/src/data/package.lisp =================================================================== --- trunk/bknr/datastore/src/data/package.lisp 2008-11-10 08:20:25 UTC (rev 4025) +++ trunk/bknr/datastore/src/data/package.lisp 2008-11-10 08:25:02 UTC (rev 4026) @@ -3,10 +3,11 @@ (defpackage :bknr.datastore (:use :cl :bknr.utils :cl-interpol :cl-ppcre :bknr.indices :bknr.statistics - :closer-mop ) + :closer-mop :alexandria) #+cmu (:shadowing-import-from :common-lisp #:subtypep #:typep) (:shadowing-import-from :cl-interpol quote-meta-chars) + (:shadowing-import-from :bknr.indices array-index) #| (:shadow :cl #:get-internal-run-time #:get-internal-real-time #:get-universal-time #:sleep) |# (:export #:*store-debug* #:*store* Modified: trunk/bknr/datastore/src/utils/package.lisp =================================================================== --- trunk/bknr/datastore/src/utils/package.lisp 2008-11-10 08:20:25 UTC (rev 4025) +++ trunk/bknr/datastore/src/utils/package.lisp 2008-11-10 08:25:02 UTC (rev 4026) @@ -35,8 +35,6 @@ #:parse-time ;; filesystem functions - #:copy-stream - #:copy-file #:move-file #:directory-empty-p #:subdir-p Modified: trunk/bknr/datastore/src/utils/utils.lisp =================================================================== --- trunk/bknr/datastore/src/utils/utils.lisp 2008-11-10 08:20:25 UTC (rev 4025) +++ trunk/bknr/datastore/src/utils/utils.lisp 2008-11-10 08:25:02 UTC (rev 4026) @@ -163,19 +163,6 @@ 0 (length (pathname-directory dir))) (pathname-directory dir))))) -(defun copy-file (source target &key (overwrite t)) - (let ((buffer (make-array 4096 :element-type '(unsigned-byte 8))) - (read-count 0)) - (with-open-file (in source :direction :input - :element-type '(unsigned-byte 8)) - (with-open-file (out target :direction :output - :element-type '(unsigned-byte 8) - :if-exists (if overwrite :overwrite :error) :if-does-not-exist :create) - (loop - (setf read-count (read-sequence buffer in)) - (write-sequence buffer out :end read-count) - (when (< read-count 4096) (return))))))) - (defun move-file (file1 file2) #+(or allegro openmcl) (rename-file file1 file2) @@ -186,19 +173,6 @@ (sb-unix:unix-rename (namestring file1) (namestring file2))) -(defun copy-stream (in out &optional (element-type '(unsigned-byte 8))) - "Copy everything from in to out" - (let* ((buffer-size 4096) - (buffer (make-array buffer-size :element-type element-type))) - (labels ((read-chunks () - (let ((size (read-sequence buffer in))) - (if (< size buffer-size) - (write-sequence buffer out :start 0 :end size) - (progn - (write-sequence buffer out) - (read-chunks)))))) - (read-chunks)))) - (defun make-temporary-pathname (&key (defaults nil) (name "tmp")) (loop for file = (make-pathname :name (format nil "~A-~A-~A" name Modified: trunk/bknr/modules/text/package.lisp =================================================================== --- trunk/bknr/modules/text/package.lisp 2008-11-10 08:20:25 UTC (rev 4025) +++ trunk/bknr/modules/text/package.lisp 2008-11-10 08:25:02 UTC (rev 4026) @@ -18,7 +18,6 @@ :alexandria) (:shadowing-import-from :bknr.indices array-index) (:shadowing-import-from :cl-interpol quote-meta-chars) - (:shadowing-import-from :alexandria #:copy-stream #:copy-file) (:export ;; billboards #:list-billboards-page Modified: trunk/bknr/web/src/packages.lisp =================================================================== --- trunk/bknr/web/src/packages.lisp 2008-11-10 08:20:25 UTC (rev 4025) +++ trunk/bknr/web/src/packages.lisp 2008-11-10 08:25:02 UTC (rev 4026) @@ -164,7 +164,6 @@ (:shadowing-import-from :cl-interpol #:quote-meta-chars) (:shadowing-import-from :hunchentoot #:host) (:shadowing-import-from :alexandria #:array-index) - (:shadowing-import-from :alexandria #:copy-stream #:copy-file) (:export #:*user* #:with-http-request #:with-http-body @@ -405,7 +404,6 @@ :bknr.user) (:shadowing-import-from :cl-interpol #:quote-meta-chars) (:shadowing-import-from :bknr.indices #:array-index) - (:shadowing-import-from :alexandria #:copy-stream #:copy-file) (:export #:imageproc #:define-imageproc-handler #:image-handler ; plain images only

1 0

[bknr-cvs] hans changed buildbot/master/master.cfg
by BKNR Commits 10 Nov '08

10 Nov '08

Revision: 4025 Author: hans URL: http://bknr.net/trac/changeset/4025 Remove linux builder for now. U buildbot/master/master.cfg Modified: buildbot/master/master.cfg =================================================================== --- buildbot/master/master.cfg 2008-11-01 10:06:28 UTC (rev 4024) +++ buildbot/master/master.cfg 2008-11-10 08:20:25 UTC (rev 4025) @@ -7,7 +7,6 @@ from buildbot.buildslave import BuildSlave c['slaves'] = [BuildSlave("paracetamol", "bknrbu1ld", max_builds=1), BuildSlave("netzhansa.com", "bknrbu1ld", max_builds=1), - BuildSlave("lisp.homelinux.net", "bknrbu1ld", max_builds=1), BuildSlave("test.createrainforest.org", "bknrbu1ld", max_builds=1), BuildSlave("harald.headcraft.de", "bknrbu1ld", max_builds=1)] @@ -29,7 +28,6 @@ builderNames=["bknr-fbsd-ccl-amd64", "bknr-fbsd-sbcl-amd64", "bknr-fbsd-sbcl-i386", - "bknr-linux-sbcl-i386", "bknr-darwin-ccl-ppc", #"bknr-linux-cmucl-i386", #"bknr-fbsd-cmucl-i386", @@ -71,11 +69,6 @@ 'builddir': "bknr-fbsd-sbcl-i386", 'factory': make_bknr_factory("trunk", "sbcl"), }, - {'name': "bknr-linux-sbcl-i386", - 'slavename': "lisp.homelinux.net", - 'builddir': "bknr-linux-sbcl-i386", - 'factory': make_bknr_factory("trunk", "sbcl"), - }, {'name': "bknr-darwin-ccl-ppc", 'slavename': "harald.headcraft.de", 'builddir': "bknr-darwin-ccl-ppc",

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/
by BKNR Commits 01 Nov '08

01 Nov '08

Revision: 4024 Author: hans URL: http://bknr.net/trac/changeset/4024 Revive full image display. A trunk/projects/quickhoney/website/static/image-full.html U trunk/projects/quickhoney/website/static/javascript.js D trunk/projects/quickhoney/website/templates/image-full.xml Added: trunk/projects/quickhoney/website/static/image-full.html =================================================================== --- trunk/projects/quickhoney/website/static/image-full.html (rev 0) +++ trunk/projects/quickhoney/website/static/image-full.html 2008-11-01 10:06:28 UTC (rev 4024) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css,image-full.css" /> + <script src="/static/image-full.js" type="text/javascript"> </script> + <title>QuickHoney image</title> + </head> + <body id="imagedetail"> + <div id="logo"> + <a href="javascript:window.close()"> + <img src="/image/quickhoney-black" id="the_logo" name="logo" border="0" /> + </a> + </div> + + <div id="image"> + <a href="javascript:window.close()"> + <img src="/image/trans" id="the_image" name="image" border="0" /> + </a> + </div> + </body> + <script language="javascript"> + load_image(); + </script> +</html> Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-10-30 16:12:57 UTC (rev 4023) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-11-01 10:06:28 UTC (rev 4024) @@ -1200,7 +1200,7 @@ } function enlarge() { - var detail_window = open("image-full#" + encodeURI(current_image.name), + var detail_window = open("/static/image-full.html#" + encodeURI(current_image.name), "_new", "width=" + current_image.width + ",height=" + current_image.height + ",status=no,toolbar=no,menubar=no"); Deleted: trunk/projects/quickhoney/website/templates/image-full.xml =================================================================== --- trunk/projects/quickhoney/website/templates/image-full.xml 2008-10-30 16:12:57 UTC (rev 4023) +++ trunk/projects/quickhoney/website/templates/image-full.xml 2008-11-01 10:06:28 UTC (rev 4024) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html - xmlns="http://www.w3.org/1999/xhtml" - xmlns:bknr="http://bknr.net" - > - <head> - <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css,image-full.css" /> - <script src="/static/image-full.js" type="text/javascript"> </script> - <title>QuickHoney image</title> - </head> - <body id="imagedetail"> - <div id="logo"> - <a href="javascript:window.close()"> - <img src="/image/quickhoney-black" id="the_logo" name="logo" border="0" /> - </a> - </div> - - <div id="image"> - <a href="javascript:window.close()"> - <img src="/image/trans" id="the_image" name="image" border="0" /> - </a> - </div> - </body> - <script language="javascript"> - load_image(); - </script> -</html>

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/sponsor-handlers.lisp
by BKNR Commits 30 Oct '08

30 Oct '08

Revision: 4023 Author: hans URL: http://bknr.net/trac/changeset/4023 Convert numsqm to integer before using it for calculations. U trunk/projects/bos/web/sponsor-handlers.lisp Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-30 15:31:22 UTC (rev 4022) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-30 16:12:57 UTC (rev 4023) @@ -109,7 +109,8 @@ (defmethod handle-object-form ((handler edit-sponsor-handler) (action (eql :create)) (sponsor (eql nil))) (with-query-params (numsqm country email name address date language want-print) (let* ((sponsor (make-sponsor :email email :country country :language language)) - (contract (make-contract sponsor (parse-integer numsqm) + (numsqm (parse-integer numsqm)) + (contract (make-contract sponsor numsqm :paidp (format nil "~A: manually created by ~A" (format-date-time (get-universal-time)) (user-login (bknr.web:bknr-session-user)))

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 30 Oct '08

30 Oct '08

Revision: 4022 Author: hans URL: http://bknr.net/trac/changeset/4022 Set download-only flag in contracts when creating, don't compare price after it has been created. U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/web/sponsor-handlers.lisp U trunk/projects/bos/web/tags.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-10-28 10:24:22 UTC (rev 4021) +++ trunk/projects/bos/m2/m2.lisp 2008-10-30 15:31:22 UTC (rev 4022) @@ -325,8 +325,7 @@ (* (length (contract-m2s contract)) +price-per-m2+)) (defmethod contract-download-only-p ((contract contract)) - (or (contract-download-only contract) - (< (contract-price contract) *mail-amount*))) + (contract-download-only contract)) (deftransaction contract-set-download-only-p (contract newval) (setf (contract-download-only contract) newval)) Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-28 10:24:22 UTC (rev 4021) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-30 15:31:22 UTC (rev 4022) @@ -114,7 +114,8 @@ (format-date-time (get-universal-time)) (user-login (bknr.web:bknr-session-user))) :date (date-to-universal date) - :download-only (not want-print)))) + :download-only (or (< (* +price-per-m2+ numsqm) *mail-amount*) + (not want-print))))) (contract-issue-cert contract name :address address :language language) (send-to-postmaster #'mail-backoffice-sponsor-data contract numsqm country email name address language (all-request-params)) (when (and email Modified: trunk/projects/bos/web/tags.lisp =================================================================== --- trunk/projects/bos/web/tags.lisp 2008-10-28 10:24:22 UTC (rev 4021) +++ trunk/projects/bos/web/tags.lisp 2008-10-30 15:31:22 UTC (rev 4022) @@ -81,7 +81,8 @@ (language (request-language)) (sponsor (make-sponsor :language language)) (contract (make-contract sponsor numsqm - :download-only download-only + :download-only (or (< (* +price-per-m2+ numsqm) *mail-amount*) + download-only) :expires (+ (if manual-transfer bos.m2::*manual-contract-expiry-time* bos.m2::*online-contract-expiry-time*)

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/sponsor-handlers.lisp
by BKNR Commits 28 Oct '08

28 Oct '08

Revision: 4021 Author: hans URL: http://bknr.net/trac/changeset/4021 Only send email if email address has been provided. U trunk/projects/bos/web/sponsor-handlers.lisp Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-27 10:03:56 UTC (rev 4020) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-28 10:24:22 UTC (rev 4021) @@ -117,7 +117,9 @@ :download-only (not want-print)))) (contract-issue-cert contract name :address address :language language) (send-to-postmaster #'mail-backoffice-sponsor-data contract numsqm country email name address language (all-request-params)) - (mail-instructions-to-sponsor contract email) + (when (and email + (length email)) + (mail-instructions-to-sponsor contract email)) (redirect (format nil "/edit-sponsor/~D" (store-object-id sponsor)))))) (defun contract-checkbox-name (contract)

1 0

[bknr-cvs] hans changed trunk/thirdparty/cl+ssl/
by BKNR Commits 27 Oct '08

27 Oct '08

Revision: 4020 Author: hans URL: http://bknr.net/trac/changeset/4020 update from upstream U trunk/thirdparty/cl+ssl/CVS/Entries U trunk/thirdparty/cl+ssl/streams.lisp Modified: trunk/thirdparty/cl+ssl/CVS/Entries =================================================================== --- trunk/thirdparty/cl+ssl/CVS/Entries 2008-10-27 06:26:46 UTC (rev 4019) +++ trunk/thirdparty/cl+ssl/CVS/Entries 2008-10-27 10:03:56 UTC (rev 4020) @@ -1,17 +1,17 @@ -/LICENSE/1.4/Tue Mar 11 05:01:27 2008// -/Makefile/1.1.1.1/Tue Mar 11 05:01:27 2008// -/bio.lisp/1.3/Tue Mar 11 05:01:27 2008// -/cl+ssl.asd/1.6/Tue Mar 11 05:01:27 2008// -/example.lisp/1.1/Tue Mar 11 05:01:27 2008// -/ffi-buffer-all.lisp/1.1/Tue Mar 11 05:01:27 2008// -/ffi-buffer-clisp.lisp/1.1/Tue Mar 11 05:01:27 2008// -/ffi-buffer.lisp/1.1/Tue Mar 11 05:01:27 2008// -/index.css/1.2/Tue Mar 11 05:01:27 2008// -/index.html/1.15/Tue Mar 11 05:01:27 2008// -/package.lisp/1.3/Tue Mar 11 05:01:27 2008// -/reload.lisp/1.5/Tue Mar 11 05:01:27 2008// -/test.lisp/1.4/Tue Mar 11 05:01:27 2008// -/conditions.lisp/1.3/Thu Apr 17 19:35:29 2008// -/ffi.lisp/1.8/Thu Apr 17 19:45:21 2008// -/streams.lisp/1.12/Thu Apr 17 19:45:19 2008// +/LICENSE/1.4/Mon Jun 23 13:16:26 2008// +/Makefile/1.1.1.1/Mon Jun 23 13:16:26 2008// +/bio.lisp/1.3/Mon Jun 23 13:16:26 2008// +/cl+ssl.asd/1.6/Mon Jun 23 13:16:26 2008// +/conditions.lisp/1.3/Mon Jun 23 13:16:26 2008// +/example.lisp/1.1/Mon Jun 23 13:16:26 2008// +/ffi-buffer-all.lisp/1.1/Mon Jun 23 13:16:26 2008// +/ffi-buffer-clisp.lisp/1.1/Mon Jun 23 13:16:26 2008// +/ffi-buffer.lisp/1.1/Mon Jun 23 13:16:26 2008// +/ffi.lisp/1.8/Mon Jun 23 13:16:26 2008// +/index.css/1.2/Mon Jun 23 13:16:26 2008// +/index.html/1.15/Mon Jun 23 13:16:26 2008// +/package.lisp/1.3/Mon Jun 23 13:16:26 2008// +/reload.lisp/1.5/Mon Jun 23 13:16:26 2008// +/test.lisp/1.4/Mon Jun 23 13:16:26 2008// +/streams.lisp/1.13/Mon Oct 27 10:03:01 2008// D Modified: trunk/thirdparty/cl+ssl/streams.lisp =================================================================== --- trunk/thirdparty/cl+ssl/streams.lisp 2008-10-27 06:26:46 UTC (rev 4019) +++ trunk/thirdparty/cl+ssl/streams.lisp 2008-10-27 10:03:56 UTC (rev 4020) @@ -167,14 +167,14 @@ (defun install-nonblock-flag (fd) (ccl::fd-set-flags fd (logior (ccl::fd-get-flags fd) #$O_NONBLOCK))) -#+sbcl +#+(and sbcl (not win32)) (defun install-nonblock-flag (fd) (sb-posix:fcntl fd sb-posix::f-setfl (logior (sb-posix:fcntl fd sb-posix::f-getfl) sb-posix::o-nonblock))) -#-(or clozure-common-lisp sbcl) +#-(or clozure-common-lisp (and sbcl (not win32))) (defun install-nonblock-flag (fd) (declare (ignore fd)))

1 0

[bknr-cvs] hans changed ediware/
by BKNR Commits 27 Oct '08

27 Oct '08

1 0

[bknr-cvs] hans changed trunk/projects/bos/m2/m2.lisp
by BKNR Commits 26 Oct '08

26 Oct '08

Revision: 4018 Author: hans URL: http://bknr.net/trac/changeset/4018 Don't consider unpaid contracts in contract statistics. U trunk/projects/bos/m2/m2.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-10-26 22:49:23 UTC (rev 4017) +++ trunk/projects/bos/m2/m2.lisp 2008-10-26 23:02:29 UTC (rev 4018) @@ -621,7 +621,7 @@ (defun initialize-contract-stats () (setq *contract-stats* (make-contract-stats)) - (dolist (contract (class-instances 'contract)) + (dolist (contract (remove-if-not #'contract-paidp (class-instances 'contract))) (add-to-contract-stats contract))) (defun add-to-contract-stats (contract)

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/news-tags.lisp
by BKNR Commits 26 Oct '08

26 Oct '08

Revision: 4017 Author: hans URL: http://bknr.net/trac/changeset/4017 Fix news links. U trunk/projects/bos/web/news-tags.lisp Modified: trunk/projects/bos/web/news-tags.lisp =================================================================== --- trunk/projects/bos/web/news-tags.lisp 2008-10-24 13:32:33 UTC (rev 4016) +++ trunk/projects/bos/web/news-tags.lisp 2008-10-26 22:49:23 UTC (rev 4017) @@ -19,7 +19,7 @@ :key #'news-item-time))) (subseq items 0 (min (length items) 3)))))) (labels ((show-news-entry (news-item) - (html ((:a :href (format nil "javascript:window_news('/~a/news/~a')" language (store-object-id news-item)) + (html ((:a :href "#" :onclick (format nil "return window_news('/~a/news/~a')" language (store-object-id news-item)) :class "more") (:strong (:princ-safe (format-date-time (news-item-time news-item) :show-time nil)) :br

1 0