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

[bknr-cvs] hans changed trunk/projects/bos/m2/m2-pdf.lisp
by BKNR Commits 10 Dec '08

10 Dec '08

Revision: 4130 Author: hans URL: http://bknr.net/trac/changeset/4130 Move m2 graphics to correct place on new certificate. U trunk/projects/bos/m2/m2-pdf.lisp Modified: trunk/projects/bos/m2/m2-pdf.lisp =================================================================== --- trunk/projects/bos/m2/m2-pdf.lisp 2008-12-10 10:56:53 UTC (rev 4129) +++ trunk/projects/bos/m2/m2-pdf.lisp 2008-12-10 12:27:59 UTC (rev 4130) @@ -21,14 +21,14 @@ (last-m2 (first (last m2s))) (scale (/ 80 (max bb-width bb-height)))) - (draw-coordinate 110 160 (m2-lon-lat first-m2)) + (draw-coordinate 140 240 (m2-lon-lat first-m2)) (unless (eq first-m2 last-m2) - (draw-coordinate 190 40 (m2-lon-lat last-m2))) + (draw-coordinate 220 120 (m2-lon-lat last-m2))) - (pdf:translate (+ 65.0 (if (>= bb-width bb-height) 0 + (pdf:translate (+ 95.0 (if (>= bb-width bb-height) 0 (* 0.5 (abs (- bb-width bb-height)) scale))) - (+ 65.0 (if (>= bb-height bb-width) 0 + (+ 145.0 (if (>= bb-height bb-width) 0 (* 0.5 (abs (- bb-width bb-height)) scale)))) (pdf:scale scale scale)

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/server.lisp
by BKNR Commits 10 Dec '08

10 Dec '08

Revision: 4129 Author: hans URL: http://bknr.net/trac/changeset/4129 Ignore ECONNABORTED errors while accepting incoming connections. U trunk/thirdparty/hunchentoot/server.lisp Modified: trunk/thirdparty/hunchentoot/server.lisp =================================================================== --- trunk/thirdparty/hunchentoot/server.lisp 2008-12-10 10:54:45 UTC (rev 4128) +++ trunk/thirdparty/hunchentoot/server.lisp 2008-12-10 10:56:53 UTC (rev 4129) @@ -399,13 +399,17 @@ (usocket:wait-for-input listener :timeout +new-connection-wait-time+))) ((server-shutdown-p server)) (when new-connection-p - (let ((client-connection (usocket:socket-accept listener))) - (when client-connection - (set-timeouts client-connection - (server-read-timeout server) - (server-write-timeout server)) - (handle-incoming-connection (server-connection-manager server) - client-connection)))))))) + (handler-case + (let ((client-connection (usocket:socket-accept listener))) + (when client-connection + (set-timeouts client-connection + (server-read-timeout server) + (server-write-timeout server)) + (handle-incoming-connection (server-connection-manager server) + client-connection))) + (usocket:connection-aborted-error () + ;; ignore condition + ))))))) (defgeneric initialize-connection-stream (server stream) (:documentation "Wraps the given STREAM with all the additional

1 0

[bknr-cvs] hans changed trunk/thirdparty/usocket/
by BKNR Commits 10 Dec '08

10 Dec '08

Revision: 4128 Author: hans URL: http://bknr.net/trac/changeset/4128 update from upstream svn _U trunk/thirdparty/usocket/ U trunk/thirdparty/usocket/condition.lisp Property changes on: trunk/thirdparty/usocket ___________________________________________________________________ Name: piston:local-revision - 4126 + 4127 Name: piston:remote-revision - 480 + 481 Modified: trunk/thirdparty/usocket/condition.lisp =================================================================== --- trunk/thirdparty/usocket/condition.lisp 2008-12-10 10:51:55 UTC (rev 4127) +++ trunk/thirdparty/usocket/condition.lisp 2008-12-10 10:54:45 UTC (rev 4128) @@ -1,4 +1,4 @@ -;;;; $Id: condition.lisp 451 2008-10-22 01:11:56Z ctian $ +;;;; $Id: condition.lisp 481 2008-12-10 10:52:01Z hhubner $ ;;;; $URL: svn://common-lisp.net/project/usocket/svn/usocket/trunk/condition.lisp $ ;;;; See LICENSE for licensing information. @@ -184,7 +184,7 @@ ((9) . bad-file-descriptor-error) ((61 111) . connection-refused-error) ((64 131) . connection-reset-error) - ((130) . connection-aborted-error) + ((53 103) . connection-aborted-error) ((22) . invalid-argument-error) ((55 105) . no-buffers-error) ((12) . out-of-memory-error)

1 0

[bknr-cvs] hans changed trunk/thirdparty/usocket/
by BKNR Commits 10 Dec '08

10 Dec '08

Revision: 4127 Author: hans URL: http://bknr.net/trac/changeset/4127 move to usocket trunk A trunk/thirdparty/usocket/ A trunk/thirdparty/usocket/LICENSE A trunk/thirdparty/usocket/Makefile A trunk/thirdparty/usocket/README A trunk/thirdparty/usocket/TODO A trunk/thirdparty/usocket/backend/ A trunk/thirdparty/usocket/backend/allegro.lisp A trunk/thirdparty/usocket/backend/armedbear.lisp A trunk/thirdparty/usocket/backend/clisp.lisp A trunk/thirdparty/usocket/backend/cmucl.lisp A trunk/thirdparty/usocket/backend/lispworks.lisp A trunk/thirdparty/usocket/backend/openmcl.lisp A trunk/thirdparty/usocket/backend/sbcl.lisp A trunk/thirdparty/usocket/backend/scl.lisp A trunk/thirdparty/usocket/condition.lisp A trunk/thirdparty/usocket/doc/ A trunk/thirdparty/usocket/doc/backends.txt A trunk/thirdparty/usocket/doc/design.txt A trunk/thirdparty/usocket/notes/ A trunk/thirdparty/usocket/notes/abcl-socket.txt A trunk/thirdparty/usocket/notes/active-sockets-apis.txt A trunk/thirdparty/usocket/notes/address-apis.txt A trunk/thirdparty/usocket/notes/allegro-socket.txt A trunk/thirdparty/usocket/notes/clisp-sockets.txt A trunk/thirdparty/usocket/notes/cmucl-sockets.txt A trunk/thirdparty/usocket/notes/errors.txt A trunk/thirdparty/usocket/notes/lw-sockets.txt A trunk/thirdparty/usocket/notes/openmcl-sockets.txt A trunk/thirdparty/usocket/notes/sb-bsd-sockets.txt A trunk/thirdparty/usocket/notes/usock-sockets.txt A trunk/thirdparty/usocket/package.lisp A trunk/thirdparty/usocket/run-usocket-tests.sh A trunk/thirdparty/usocket/test/ A trunk/thirdparty/usocket/test/abcl.conf.in A trunk/thirdparty/usocket/test/allegro.conf.in A trunk/thirdparty/usocket/test/clisp.conf.in A trunk/thirdparty/usocket/test/cmucl.conf.in A trunk/thirdparty/usocket/test/package.lisp A trunk/thirdparty/usocket/test/sbcl.conf.in A trunk/thirdparty/usocket/test/test-usocket.lisp A trunk/thirdparty/usocket/test/usocket-test.asd A trunk/thirdparty/usocket/test/your-lisp.conf.in A trunk/thirdparty/usocket/usocket.asd A trunk/thirdparty/usocket/usocket.lisp Change set too large, please see URL above

1 0

[bknr-cvs] hans changed trunk/thirdparty/usocket/
by BKNR Commits 10 Dec '08

10 Dec '08

Revision: 4126 Author: hans URL: http://bknr.net/trac/changeset/4126 moving to usocket trunk D trunk/thirdparty/usocket/

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms/poi-ms.
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4125 Author: hans URL: http://bknr.net/trac/changeset/4125 Maps tweaks U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 20:04:01 UTC (rev 4124) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 21:47:02 UTC (rev 4125) @@ -143,6 +143,6 @@ height: 505px; } #map.small { - width: 400px; - height: 150px; + width: 505px; + height: 200px; } Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 20:04:01 UTC (rev 4124) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 21:47:02 UTC (rev 4125) @@ -23,9 +23,10 @@ </div> </div> <div id="content"> + <h1 id="title"></h1> + <div id="map"><img src="fake-map.jpg" width="505" height="505"/></div> <div id="content-body"> </div> - <div id="map"><img src="fake-map.jpg" width="505" height="505"/></div> </div> </div> </body> Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 20:04:01 UTC (rev 4124) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 21:47:02 UTC (rev 4125) @@ -79,6 +79,8 @@ var poi = e.data[0]; var medium = e.data[1]; + mainMap.hide(); + /* Work around jQuery bug when trying to remove applet from DOM with IE. */ var applet = $("#applet")[0]; if (applet) { @@ -88,10 +90,10 @@ $('#media-list *').removeClass('active'); $(e.target).addClass('active'); + $('#title').text(poi.title); $('#content-body') .empty() - .append(H1(null, poi.title), - H2(null, medium.title), + .append(H2(null, medium.title), mediaHandlers[medium.mediumType].makeViewer(medium), H3(null, medium.subtitle), P(null, medium.description)); @@ -134,6 +136,8 @@ poi = poi.data; } + mainMap.poiDetail(poi.x, poi.y); + $('#back').css('visibility', 'inherit'); $('#left-bar') .empty() @@ -142,10 +146,11 @@ document.title = poi.title; + $('#title').text(poi.title); + $('#content-body') .empty() - .append(H1(null, poi.title), - H2(null, poi.subtitle), + .append(H2(null, poi.subtitle), P(null, poi.description)); map(function (medium) { if (mediaHandlers[medium.mediumType]) { @@ -158,7 +163,6 @@ } }, poi.media.sort(compareMedia)); - mainMap.hide(); } function pointToPath(point, level) { @@ -175,9 +179,11 @@ function showOverview() { $('#back').css('visibility', 'hidden'); + + $('#title').text(NLS('Übersicht')); + $('#content-body') - .empty() - .append(H1(null, NLS('Übersicht'))); + .empty(); $('#left-bar') .empty() @@ -282,16 +288,16 @@ $('#map').removeClass('small'); $('#map').addClass('large'); this.addControls(); + this.map.checkResize(); this.map.setCenter(projection.fromPixelToLatLng(new GPoint(6500, 6350), 6), 2, customMap); - this.map.checkResize(); } this.poiDetail = function (x, y) { $('#map').removeClass('large'); $('#map').addClass('small'); this.removeControls(); + this.map.checkResize(); this.map.setCenter(projection.fromPixelToLatLng(new GPoint(x, y), 6), 6); - this.map.checkResize(); } this.zoomTo = function (x, y, level) {

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms/poi-ms.
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4124 Author: hans URL: http://bknr.net/trac/changeset/4124 Re-enable Google Maps U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 17:01:00 UTC (rev 4123) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 20:04:01 UTC (rev 4124) @@ -139,8 +139,8 @@ float:left; } #map.large { - width: 600px; - height: 600px; + width: 505px; + height: 505px; } #map.small { width: 400px; Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 17:01:00 UTC (rev 4123) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 20:04:01 UTC (rev 4124) @@ -6,7 +6,7 @@ <script src="/static/MochiKit/MochiKit.js" type="text/javascript"> </script> <script src="/static/jquery-nightly.js" type="text/javascript"> </script> <script src="poi-ms.js" type="text/javascript"> </script> - + <script src="http://maps.google.com/maps?file=api&v=2&key=ABQIAAAA5meUSZ1F7u46Uj…" type="text/javascript"> </script> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> </head> <body> @@ -16,7 +16,7 @@ <div class="navigation"> <div id="small-map" class="map"> <a href="#"><img src="uebersichtskarte_klein.gif" width="118" height="58" border="0"/></a><br /> - <a href="#" id="back">zurueck</a> + <a href="#" id="back">zurück</a> </div> <div id="left-bar"> </div> Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 17:01:00 UTC (rev 4123) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 20:04:01 UTC (rev 4124) @@ -219,10 +219,11 @@ this.map = new GMap2($('#map')[0]); var copyrightCollection = new GCopyrightCollection('Map'); - copyrightCollection.addCopyright(new GCopyright(1, - new GLatLngBounds(new GLatLng(-90, -180), new GLatLng(90, 180)), - 3, - "Copyright BOS Deutschland e.V.")); + copyrightCollection + .addCopyright(new GCopyright(1, + new GLatLngBounds(new GLatLng(-90, -180), new GLatLng(90, 180)), + 3, + "Copyright BOS Deutschland e.V.")); this.layers = {}; @@ -280,8 +281,8 @@ this.show(); $('#map').removeClass('small'); $('#map').addClass('large'); -// this.addControls(); - this.map.setCenter(projection.fromPixelToLatLng(new GPoint(7000, 6350), 6), 3, customMap); + this.addControls(); + this.map.setCenter(projection.fromPixelToLatLng(new GPoint(6500, 6350), 6), 2, customMap); this.map.checkResize(); } @@ -420,7 +421,7 @@ pois[poi.id] = poi; } - mainMap = new FakeMap(); + mainMap = new Map(); loadJSONDoc('/sponsors-json').addCallback(loadSponsors); }

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms/poi-ms.
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4123 Author: hans URL: http://bknr.net/trac/changeset/4123 Cleanup. Sort POI media by type, date. U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 16:25:20 UTC (rev 4122) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 17:01:00 UTC (rev 4123) @@ -7,6 +7,7 @@ background-image: url(bg.gif); background-repeat: repeat-y; } + h1 { font-size: 19px; font-weight: bold; @@ -14,37 +15,41 @@ height:62px; margin:0px; } + h2 { font-size:15px; margin:0px; font-weight: bold; } + h3 { font-size:12px; font-weight:bold; margin:0px; } -.yui-t3 { +#doc { float:left; width:740px; } + #left-bar { background-color:#B2B774; padding-top:10px; height:500px; } -.yui-b { + +.navigation { float:left; width:190px; margin-right:20px; } - -.yui-main { +#content { float:left; width:506px; } + #content-body { width:506px; float:left; @@ -55,6 +60,7 @@ #content-body img { padding-top:15px; } + a#back { color:#AFAFAF; text-decoration: none; @@ -90,6 +96,7 @@ height:37px; background-color:#FFFFFF } + ul#poi-list li { position: relative; height: 44px; Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 16:25:20 UTC (rev 4122) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 17:01:00 UTC (rev 4123) @@ -10,29 +10,22 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> </head> <body> - <div id="doc" class="yui-t3"> + <div id="doc"> <div id="hd"><img src="site_header-de.jpg" /></div> <div id="bd"> - - <div class="yui-b"> + <div class="navigation"> <div id="small-map" class="map"> <a href="#"><img src="uebersichtskarte_klein.gif" width="118" height="58" border="0"/></a><br /> - <a href="#" id="back">zurueck</a> + <a href="#" id="back">zurueck</a> </div> <div id="left-bar"> </div> </div> </div> - - - <div id="yui-main"> - <div id="content"> - <div id="content-body"> - </div> + <div id="content"> + <div id="content-body"> + </div> <div id="map"><img src="fake-map.jpg" width="505" height="505"/></div> - </div> - </div> - <div id="ft"> </div> </div> </body> Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 16:25:20 UTC (rev 4122) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 17:01:00 UTC (rev 4123) @@ -121,6 +121,14 @@ return path; } +function compareMedia (a, b) { + if (a.mediumType == b.mediumType) { + return (b.timestamp < a.timestamp) ? -1 : 1; + } else { + return (a.mediumType < b.mediumType) ? -1 : 1; + } +} + function showPOI(poi) { if (poi.data) { poi = poi.data; @@ -148,7 +156,7 @@ B(null, medium.title || medium.name)))) .bind('click', [ poi, medium ], showMedium)); } - }, poi.media); + }, poi.media.sort(compareMedia)); mainMap.hide(); }

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4122 Author: hans URL: http://bknr.net/trac/changeset/4122 Add new POI microsite with design by Sven Springer A trunk/projects/bos/payment-website/static/poi-ms/ A trunk/projects/bos/payment-website/static/poi-ms/bg.gif A trunk/projects/bos/payment-website/static/poi-ms/fake-map.jpg A trunk/projects/bos/payment-website/static/poi-ms/film-icon.jpg A trunk/projects/bos/payment-website/static/poi-ms/panorama-icon.jpg A trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css A trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html A trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js A trunk/projects/bos/payment-website/static/poi-ms/site_header-de.jpg A trunk/projects/bos/payment-website/static/poi-ms/site_header-en.jpg A trunk/projects/bos/payment-website/static/poi-ms/uebersichtskarte_klein.gif D trunk/projects/bos/payment-website/static/poi-ms.css D trunk/projects/bos/payment-website/static/poi-ms.html D trunk/projects/bos/payment-website/static/poi-ms.js Change set too large, please see URL above

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms.html
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4121 Author: hans URL: http://bknr.net/trac/changeset/4121 disable google maps for the moment U trunk/projects/bos/payment-website/static/poi-ms.html Modified: trunk/projects/bos/payment-website/static/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-09 06:41:00 UTC (rev 4120) +++ trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-09 06:58:11 UTC (rev 4121) @@ -7,7 +7,7 @@ <script src="MochiKit/MochiKit.js" type="text/javascript"> </script> <script src="jquery-nightly.js" type="text/javascript"> </script> <script src="poi-ms.js" type="text/javascript"> </script> - <script src="http://maps.google.com/maps?file=api&v=2&key=ABQIAAAA5meUSZ1F7u46Uj…" type="text/javascript"> </script> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> </head> <body>

1 0