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

[bknr-cvs] r1902 - trunk/projects/quickhoney/website/static
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:42:39 -0500 (Tue, 07 Mar 2006) New Revision: 1902 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Recover "nice_jobs" and some other changes that got lost somewhere. Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:33:03 UTC (rev 1901) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:42:39 UTC (rev 1902) @@ -527,17 +527,17 @@ document.getElementById("path").innerHTML = path_links.join(" / "); } -/* home image - called from homeimage.onload */ +/* home image */ function home_loaded(image) { debug('home_loaded - image is ' + image + ' width: ' + image.width); - image.style.left = (36 + (648 - image.width) / 2) + 'px'; - image.style.top = (114 + (648 - image.height) / 2) + 'px'; - reveal_image(image); + document.getElementById("homeimage").style.left = (36 + (648 - image.width) / 2) + 'px'; + document.getElementById("homeimage").style.top = (114 + (648 - image.height) / 2) + 'px'; + if (logged_in) { var current_home_image = image.src.substring(image.src.indexOf('/image/') + 7); if (current_home_image != 'trans') { @@ -744,7 +744,7 @@ thumbnail_html += '<a href="#" onclick="display_image(' + "'" + image.position + "'" + ');">' + '<img class="inherited_image" width="' + cell_width + '" height="' + cell_height + '" ' - + ' src="/image/' + image.name + '/cell,' + background_color + ',' + cell_width + ',' + cell_height + ',8" ' + + ' src="/image/' + image.name + '/cell,' + background_color + ',' + cell_width + ',' + cell_height + '" ' + ' onload="reveal_image(this);" />' + '</a>'; } @@ -876,6 +876,17 @@ detail_window.focus(); } +/* nice_jobs() is a special form of a subdirectory which does not have a parent directory */ + +function nice_jobs() { + + document.getElementById("clients").style.visibility = 'hidden'; + + current_directory = 'clients'; + current_image = null; + subdirectory('nicejobs'); +} + /* Used from image-detail to load the current image */ function load_image() { @@ -953,7 +964,7 @@ document.getElementById("debugger").style.visibility = 'visible'; document.getElementById("debugger").style.left = '730px'; document.getElementById("debugger").style.width = '400px'; - document.getElementById("debugger").style.height = '640px'; + document.getElementById("debugger").style.heigth = '640px'; } else { document.getElementById("debugger").style.left = "1px"; document.getElementById("debugger").style.right = "1px";

1 0

[bknr-cvs] r1901 - trunk/projects/quickhoney/website/templates
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:33:03 -0500 (Tue, 07 Mar 2006) New Revision: 1901 Modified: trunk/projects/quickhoney/website/templates/index.bknr Log: Changed wrong image before. Modified: trunk/projects/quickhoney/website/templates/index.bknr =================================================================== --- trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:31:04 UTC (rev 1900) +++ trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:33:03 UTC (rev 1901) @@ -105,7 +105,7 @@ <div id="contact"> <div id="contact-bigimage"> - <img src="/image/contact_nanapeter" /> + <img src="/image/contact-peter-nana" /> </div> <img class="contact" src="/image/type_contact_email" /> <p class="contact"> @@ -117,7 +117,7 @@ Peter Stemmler: 646.270.5562<br /> Nana Rausch: 646.270.5592 </p> - <img class="contact" src="/image/contact-peter-nana" /> + <img class="contact" src="/image/type_contact_address" /> <p class="contact"> QuickHoney - New York<br /> 536 Sixth Avenue, 2nd&3rd Floor<br />

1 0

[bknr-cvs] r1900 - trunk/projects/quickhoney/website/templates
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:31:04 -0500 (Tue, 07 Mar 2006) New Revision: 1900 Modified: trunk/projects/quickhoney/website/templates/index.bknr Log: Contact image changed. Change copyright notice to show 2006. Modified: trunk/projects/quickhoney/website/templates/index.bknr =================================================================== --- trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 18:58:28 UTC (rev 1899) +++ trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:31:04 UTC (rev 1900) @@ -117,7 +117,7 @@ Peter Stemmler: 646.270.5562<br /> Nana Rausch: 646.270.5592 </p> - <img class="contact" src="/image/type_contact_address" /> + <img class="contact" src="/image/contact-peter-nana" /> <p class="contact"> QuickHoney - New York<br /> 536 Sixth Avenue, 2nd&3rd Floor<br /> @@ -127,7 +127,7 @@ </div> <div id="footer" class="text"> - ©1998-2005 QuickHoney Nana Rausch & Peter Stemmler. No part of + ©1998-2006 QuickHoney Nana Rausch & Peter Stemmler. No part of this website may be reproduced in any manner without permission. Programming by Hübner/Odendahl <a href="http://headcraft.de/" target="_new"> headcraft</a>

1 0

[bknr-cvs] r1899 - trunk/projects/quickhoney/website/static
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 13:58:28 -0500 (Tue, 07 Mar 2006) New Revision: 1899 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Change city -> t-shirt Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 18:55:49 UTC (rev 1898) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 18:58:28 UTC (rev 1899) @@ -6,7 +6,7 @@ directory_button['pixel'] = ['birdview', 'parts', 'icons', 'editorial', 'animation', 'smallworld']; directory_button['vector'] = ['portraits', 'celebrities', 'blackwhite', 'icons', 'editorial', 'nudes']; -directory_button['photo'] = ['browseall', 'city', 'landscape', 'shopping', 'food', 'special']; +directory_button['photo'] = ['browseall', 't-shirt', 'landscape', 'shopping', 'food', 'special']; /* safari global variable - used to trigger some compatibility hacks */

1 0

[bknr-cvs] r1898 - trunk/projects/quickhoney/src
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 13:55:49 -0500 (Tue, 07 Mar 2006) New Revision: 1898 Modified: trunk/projects/quickhoney/src/load.lisp Log: Start swank Modified: trunk/projects/quickhoney/src/load.lisp =================================================================== --- trunk/projects/quickhoney/src/load.lisp 2006-03-07 06:54:18 UTC (rev 1897) +++ trunk/projects/quickhoney/src/load.lisp 2006-03-07 18:55:49 UTC (rev 1898) @@ -1,5 +1,8 @@ (push :cl-gd-gif *features*) (asdf:oos 'asdf:load-op :quickhoney) +(asdf:oos 'asdf:load-op :swank) +(swank::create-swank-server 4008 :spawn #'swank::simple-announce-function t) + (mp::startup-idle-and-top-level-loops)

1 0

[bknr-cvs] r1896 - branches/xml-class-rework/bknr/src/web
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 01:49:08 -0500 (Tue, 07 Mar 2006) New Revision: 1896 Modified: branches/xml-class-rework/bknr/src/web/authorizer.lisp Log: Remove debug output. Modified: branches/xml-class-rework/bknr/src/web/authorizer.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-07 06:45:29 UTC (rev 1895) +++ branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-07 06:49:08 UTC (rev 1896) @@ -72,7 +72,6 @@ (req http-request) ent) - (format t "; trying to authorize request~%") ;; Catch any errors that occur during request body processing (handler-case ;; first check session cookie or bknr-sessionid parameter. the @@ -84,7 +83,6 @@ (when session (bknr-session-touch session) (change-class req 'bknr-request :session session) - (format t "; request authorized~%") (return-from authorize t))) (error (e) (format t "; Caught error ~A during request processing~%" e)

1 0

[bknr-cvs] r1894 - branches/xml-class-rework/projects/mah-jongg/website
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 01:09:21 -0500 (Tue, 07 Mar 2006) New Revision: 1894 Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl Log: Confirm "Undo Last Game" and "End Round" buttons. Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-07 06:01:12 UTC (rev 1893) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-07 06:09:21 UTC (rev 1894) @@ -93,9 +93,9 @@ <div id="control-buttons"> <xsl:if test="@undo-timestamp != ''"> <input type="hidden" name="undo-timestamp" value="{@undo-timestamp}"/> - <button type="submit" name="action" value="undo">Undo Last Game</button> + <button type="submit" name="action" value="undo" onclick="return confirm('Undo last game entered?');">Undo Last Game</button> </xsl:if> - <button type="submit" name="action" value="clear-round">End Round</button> + <button type="submit" name="action" value="clear-round" onclick="return confirm('End this round?');">End Round</button> </div> </form> </body>

1 0

[bknr-cvs] r1893 - in branches/xml-class-rework/projects/mah-jongg: src website
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 01:01:12 -0500 (Tue, 07 Mar 2006) New Revision: 1893 Modified: branches/xml-class-rework/projects/mah-jongg/src/game.lisp branches/xml-class-rework/projects/mah-jongg/website/game.css branches/xml-class-rework/projects/mah-jongg/website/game.xsl Log: Add Button to undo last game entered. Modified: branches/xml-class-rework/projects/mah-jongg/src/game.lisp =================================================================== --- branches/xml-class-rework/projects/mah-jongg/src/game.lisp 2006-03-07 05:58:42 UTC (rev 1892) +++ branches/xml-class-rework/projects/mah-jongg/src/game.lisp 2006-03-07 06:01:12 UTC (rev 1893) @@ -54,13 +54,14 @@ (defclass game () ((winner :reader winner :initarg :winner) (east :reader east :initarg :east) + (undo-timestamp :reader undo-timestamp :initarg :undo-timestamp) (results :reader results :initarg :results :documentation "List ((<player> <score>) (...))"))) (defmethod print-object ((game game) stream) (print-unreadable-object (game stream :type t) (format stream "WINNER: ~S" (name (winner game))))) -(deftransaction make-game (winner results) +(deftransaction make-game (undo-timestamp winner results) (let* ((all-results (mapcar #'(lambda (name-score) (list (find-player (car name-score)) (cadr name-score))) results)) (winner (find-player winner)) (east (find-if #'east-p (players *round*))) @@ -78,6 +79,7 @@ (rotate-winds) (setf (east-win-count *round*) 0)) (car (push (make-instance 'game + :undo-timestamp undo-timestamp :winner winner :east east :results all-results) @@ -85,6 +87,8 @@ (defun round-as-xml () (with-element "round" + (when (games *round*) + (attribute "undo-timestamp" (undo-timestamp (first (games *round*))))) (dolist (player (players *round*)) (with-slots (name wind score) player (with-element "player" @@ -92,7 +96,7 @@ (attribute "wind" (string-downcase wind)) (attribute "score" score)))) (dolist (game (reverse (games *round*))) - (with-slots (winner east results) game + (with-slots (winner east results undo-timestamp) game (with-element "game" (dolist (player (players *round*)) (with-element "score" @@ -108,12 +112,15 @@ (defun handle-game (req ent) (when (eq :post (request-method req)) - (with-query-params (req action east north west south winner) + (with-query-params (req action undo-timestamp east north west south winner) (ecase (make-keyword-from-string action) + (:undo + (restore (parse-integer undo-timestamp))) (:make-round (make-round east north west south)) (:make-game - (make-game (name (wind->player (make-keyword-from-string winner))) + (make-game (1- (get-universal-time)) + (name (wind->player (make-keyword-from-string winner))) (mapcar #'(lambda (wind) (list (name (wind->player wind)) (parse-integer (query-param req (symbol-name wind))))) '(:east :north :west :south)))) Modified: branches/xml-class-rework/projects/mah-jongg/website/game.css =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.css 2006-03-07 05:58:42 UTC (rev 1892) +++ branches/xml-class-rework/projects/mah-jongg/website/game.css 2006-03-07 06:01:12 UTC (rev 1893) @@ -60,7 +60,7 @@ text-align: right; } -#end-round-button { +#control-buttons { position: fixed; right: 20px; bottom: 20px; Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-07 05:58:42 UTC (rev 1892) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-07 06:01:12 UTC (rev 1893) @@ -90,7 +90,13 @@ </tr> </tbody> </table> - <button type="submit" name="action" id="end-round-button" value="clear-round">End Round</button> + <div id="control-buttons"> + <xsl:if test="@undo-timestamp != ''"> + <input type="hidden" name="undo-timestamp" value="{@undo-timestamp}"/> + <button type="submit" name="action" value="undo">Undo Last Game</button> + </xsl:if> + <button type="submit" name="action" value="clear-round">End Round</button> + </div> </form> </body> </xsl:template>

1 0

[bknr-cvs] r1892 - branches/xml-class-rework/bknr/src/data
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 00:58:42 -0500 (Tue, 07 Mar 2006) New Revision: 1892 Modified: branches/xml-class-rework/bknr/src/data/txn.lisp Log: When restoring a store with :until, truncate the log file at the :until position. :until can now be used to implement a roll-forward based undo facility. Modified: branches/xml-class-rework/bknr/src/data/txn.lisp =================================================================== --- branches/xml-class-rework/bknr/src/data/txn.lisp 2006-03-06 21:55:14 UTC (rev 1891) +++ branches/xml-class-rework/bknr/src/data/txn.lisp 2006-03-07 05:58:42 UTC (rev 1892) @@ -462,39 +462,46 @@ (defvar *show-transactions* nil) +(defun truncate-log (pathname position) + (let ((backup (make-pathname :type "backup" :defaults pathname))) + (format t "~&; creating log file backup: ~A~%" backup) + (with-open-file (s pathname + :element-type '(unsigned-byte 8) + :direction :input) + (with-open-file (r backup + :element-type '(unsigned-byte 8) + :direction :output) + (copy-stream s r)))) + (format t "~&; truncating transaction log at position ~D.~%" position) + #+cmu + (unix:unix-truncate (ext:unix-namestring pathname) position) + #+sbcl + (sb-posix:truncate (namestring pathname) position)) + (defun load-transaction-log (pathname &key until) - (let (length p) + (let (length position) (restart-case (with-open-file (s pathname :element-type '(unsigned-byte 8) :direction :input) (setf length (file-length s)) (loop - (setf p (file-position s)) - (unless (< p length) + (setf position (file-position s)) + (unless (< position length) (return)) (let ((txn (decode s))) - (when (or (not until) - (<= (transaction-timestamp txn) until)) - (when *show-transactions* - (format t "~&;;; txn @~D: ~A~%" p txn)) - (execute-unlogged txn))))) + (cond + ((and until + (> (transaction-timestamp txn) until)) + (truncate-log pathname position) + (return-from load-transaction-log)) + (t + (when *show-transactions* + (format t "~&;;; ~A txn @~D: ~A~%" (transaction-timestamp txn) position txn)) + (execute-unlogged txn)))))) (discard () :report "Discard rest of transaction log." - (let ((backup (make-pathname :type "backup" :defaults pathname))) - (format t "~&; creating log file backup: ~A~%" backup) - (with-open-file (s pathname - :element-type '(unsigned-byte 8) - :direction :input) - (with-open-file (r backup - :element-type '(unsigned-byte 8) - :direction :output) - (copy-stream s r)))) - (format t "~&; truncating transaction log at position ~D.~%" p) - #+cmu - (unix:unix-truncate (ext:unix-namestring pathname) p) - #+sbcl - (sb-posix:truncate (namestring pathname) p))))) + (truncate-log pathname position))))) (defgeneric restore-subsystem (store subsystem &key until))

1 0

[bknr-cvs] r1891 - branches/xml-class-rework/projects/mah-jongg/website
by bknr＠bknr.net 06 Mar '06

06 Mar '06

Author: hhubner Date: 2006-03-06 16:55:14 -0500 (Mon, 06 Mar 2006) New Revision: 1891 Modified: branches/xml-class-rework/projects/mah-jongg/website/game.js Log: Make scoring no points possible. Modified: branches/xml-class-rework/projects/mah-jongg/website/game.js =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-06 20:01:56 UTC (rev 1890) +++ branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-06 21:55:14 UTC (rev 1891) @@ -57,7 +57,7 @@ } for (i in winds) { - if (!$(winds[i]).value.match(/^[1-9]/)) { + if (!$(winds[i]).value.match(/^[0-9]/)) { is_valid = false; } }

1 0