bknr-cvs July 2008

bknr-cvs@common-lisp.net

1 participants
321 discussions

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/templates/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3553 Author: ksprotte URL: http://bknr.net/trac/changeset/3553 updated links to new satmap.xml in templates U trunk/projects/bos/payment-website/templates/da/idea.xml U trunk/projects/bos/payment-website/templates/da/toplevel.xml U trunk/projects/bos/payment-website/templates/da/toplevel_main.xml U trunk/projects/bos/payment-website/templates/de/idea.xml U trunk/projects/bos/payment-website/templates/de/toplevel.xml U trunk/projects/bos/payment-website/templates/de/toplevel_main.xml U trunk/projects/bos/payment-website/templates/de/toplevel_news.xml U trunk/projects/bos/payment-website/templates/en/idea.xml U trunk/projects/bos/payment-website/templates/en/toplevel.xml U trunk/projects/bos/payment-website/templates/en/toplevel_main.xml Modified: trunk/projects/bos/payment-website/templates/da/idea.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/idea.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/da/idea.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -32,7 +32,7 @@ Satellit fotos her på internettet gør det muligt at observere programmets fremgang. <br></br><br></br> I løbet af de sidste årtier er den engang så artsrige regnskov i - <a href="javascript:window_infosys()" class="titlegreen"> + <a href="/da/satmap" class="titlegreen"> Samboja Lestari blevet nådesløst fældet og nedbrændt. </a> Næringsopslugende elefantgræs tog over, og hvad der blev tilbage var en økologisk ødemark. I dag er det dog allerede tydeligt, at dette ikke behøver fortsætte - siden 2001 har BOS skabt ny regnskov. Modified: trunk/projects/bos/payment-website/templates/da/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -48,7 +48,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" title="Move to satellite map."> + <a href="/da/satmap" class="menue" title="Move to satellite map."> satellitkort </a> </div> Modified: trunk/projects/bos/payment-website/templates/da/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -44,7 +44,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" title="Move to satellite map."> + <a href="/da/satmap" class="menue" title="Move to satellite map."> satellitkort </a> </div> @@ -122,7 +122,7 @@ <td></td> <td colspan="2"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt=""></img> - <a href="javascript:window_infosys()" class="content_black"> + <a href="/da/satmap" class="content_black"> Det handler om m².<br></br><br></br> </a> </td> @@ -130,7 +130,7 @@ </tr> <tr> <td colspan="3" height="88"> - <a href="javascript:window_infosys()"> + <a href="/da/satmap"> <img src="/images/trans.gif" width="149" height="108" border="0" alt=""></img> </a> </td> Modified: trunk/projects/bos/payment-website/templates/de/idea.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/idea.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/de/idea.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -39,7 +39,7 @@ im Internet beobachten. <br /><br /> Der ehemals artenreiche Regenwald von - <a href="javascript:window_infosys()" class="titlegreen"> + <a href="/de/satmap" class="titlegreen"> Samboja Lestari </a> wurde in den letzten Jahrzehnten rücksichtslos gerodet und abgebrannt. Nährstoffzehrendes Alang-Alang-Gras breitete Modified: trunk/projects/bos/payment-website/templates/de/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -54,7 +54,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/de/satmap" class="menue" title="Satellitenkarte"> Satellitenkarte </a> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -54,7 +54,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/de/satmap" class="menue" title="Satellitenkarte"> Satellitenkarte </a> @@ -135,7 +135,7 @@ <td></td> <td colspan="2"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt="" /> - <a href="javascript:window_infosys()" + <a href="/de/satmap" class="content_black"> Es dreht sich um m². </a> @@ -144,7 +144,7 @@ </tr> <tr> <td colspan="3" height="88"> - <a href="javascript:window_infosys()"> + <a href="/de/satmap"> <img src="/images/trans.gif" width="149" height="108" border="0" alt="" /> </a> </td> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_news.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -51,7 +51,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/de/satmap" class="menue" title="Satellitenkarte"> Satellitenkarte </a> @@ -132,7 +132,7 @@ <td></td> <td colspan="2"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt="" /> - <a href="javascript:window_infosys()" + <a href="/de/satmap" class="content_black"> Es dreht sich um m². </a> @@ -141,7 +141,7 @@ </tr> <tr> <td colspan="3" height="88"> - <a href="javascript:window_infosys()"> + <a href="/de/satmap"> <img src="/images/trans.gif" width="149" height="108" border="0" alt="" /> </a> </td> Modified: trunk/projects/bos/payment-website/templates/en/idea.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/idea.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/en/idea.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -39,7 +39,7 @@ Satellite pictures here on the internet make it possible to observe the progress of this concept. <br /><br /> During the last decades the once species-rich rainforest of - <a href="javascript:window_infosys()" class="titlegreen"> + <a href="/en/satmap" class="titlegreen"> Samboja Lestari </a> was cleared and burnt down relentlessly. Modified: trunk/projects/bos/payment-website/templates/en/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -56,7 +56,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/en/satmap" class="menue" title="Move to satellite map."> satellite map </a> Modified: trunk/projects/bos/payment-website/templates/en/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -52,7 +52,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/en/satmap" class="menue" title="Move to satellite map."> satellite map </a> @@ -133,7 +133,7 @@ <td></td> <td colspan="2"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt="" /> - <a href="javascript:window_infosys()" + <a href="/en/satmap" class="content_black"> It's all about m².<br /><br /> </a> @@ -142,7 +142,7 @@ </tr> <tr> <td colspan="3" height="88"> - <a href="javascript:window_infosys()"> + <a href="/en/satmap"> <img src="/images/trans.gif" width="149" height="108" border="0" alt="" /> </a> </td>

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/templates/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3552 Author: ksprotte URL: http://bknr.net/trac/changeset/3552 added satmap.xml to templates A trunk/projects/bos/payment-website/templates/da/satmap.xml A trunk/projects/bos/payment-website/templates/de/satmap.xml A trunk/projects/bos/payment-website/templates/en/satmap.xml Added: trunk/projects/bos/payment-website/templates/da/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/satmap.xml (rev 0) +++ trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-07-22 11:39:17 UTC (rev 3552) @@ -0,0 +1,88 @@ +<?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"> +<bknr:toplevel + template="toplevel_main" + title="REGENWALD für SAMBOJA LESTARI" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:bos="http://headcraft.de/bos" + > + <bos:set-cachable/> + <div id="content_main"> + <div id="textbox_content_bigger"> + <table border="0" cellpadding="0" cellspacing="0"> + + <tr> + <td colspan="2"> + <span class="headline"> + Satellitenkarte + </span> + </td> + <td align="center" valign="top"> + <img src="../images/pfeil_back.gif" width="10" height="9" alt="" /> + <a href="javascript:history.back()" class="titlegray"> + zurück + </a> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Verschaffen Sie sich einen Überblick auf unserer + <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> + Satellitenkarte</a>. + </td> + </tr> +  + <tr> + <td height="12"> + </td> + </tr> +  + <tr> + <td colspan="3"> + <span class="headline"> + Besuchen Sie Samboja Lestari in Google Earth + </span> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Wenn die <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>Google Earth Software</a> + auf Ihrem Computer installiert ist, können Sie sich das Projektgebiet mit einer Auswahl verschiedener + Satelliten Bilder (aus dem Zeitraum 2000 - 2007) und vielen weiteren Informationen anschauen. + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Über diesen Link wird sich direkt Ihre Google Earth Applikation öffnen: + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> + <a shape="rect" class="more" href="/static/kml-root-de.kml"> + zu Google Earth + </a> + </td> + </tr> + </table> + </div> + </div> +</bknr:toplevel> Added: trunk/projects/bos/payment-website/templates/de/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/satmap.xml (rev 0) +++ trunk/projects/bos/payment-website/templates/de/satmap.xml 2008-07-22 11:39:17 UTC (rev 3552) @@ -0,0 +1,88 @@ +<?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"> +<bknr:toplevel + template="toplevel_main" + title="REGENWALD für SAMBOJA LESTARI" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:bos="http://headcraft.de/bos" + > + <bos:set-cachable/> + <div id="content_main"> + <div id="textbox_content_bigger"> + <table border="0" cellpadding="0" cellspacing="0"> + + <tr> + <td colspan="2"> + <span class="headline"> + Satellitenkarte + </span> + </td> + <td align="center" valign="top"> + <img src="../images/pfeil_back.gif" width="10" height="9" alt="" /> + <a href="javascript:history.back()" class="titlegray"> + zurück + </a> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Verschaffen Sie sich einen Überblick auf unserer + <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> + Satellitenkarte</a>. + </td> + </tr> +  + <tr> + <td height="12"> + </td> + </tr> +  + <tr> + <td colspan="3"> + <span class="headline"> + Besuchen Sie Samboja Lestari in Google Earth + </span> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Wenn die <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>Google Earth Software</a> + auf Ihrem Computer installiert ist, können Sie sich das Projektgebiet mit einer Auswahl verschiedener + Satelliten Bilder (aus dem Zeitraum 2000 - 2007) und vielen weiteren Informationen anschauen. + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Über diesen Link wird sich direkt Ihre Google Earth Applikation öffnen: + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> + <a shape="rect" class="more" href="/static/kml-root-de.kml"> + zu Google Earth + </a> + </td> + </tr> + </table> + </div> + </div> +</bknr:toplevel> Added: trunk/projects/bos/payment-website/templates/en/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/satmap.xml (rev 0) +++ trunk/projects/bos/payment-website/templates/en/satmap.xml 2008-07-22 11:39:17 UTC (rev 3552) @@ -0,0 +1,88 @@ +<?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"> +<bknr:toplevel + template="toplevel_main" + title="REGENWALD für SAMBOJA LESTARI" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:bos="http://headcraft.de/bos" + > + <bos:set-cachable/> + <div id="content_main"> + <div id="textbox_content_bigger"> + <table border="0" cellpadding="0" cellspacing="0"> + + <tr> + <td colspan="2"> + <span class="headline"> + Satellitenkarte + </span> + </td> + <td align="center" valign="top"> + <img src="../images/pfeil_back.gif" width="10" height="9" alt="" /> + <a href="javascript:history.back()" class="titlegray"> + zurück + </a> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Verschaffen Sie sich einen Überblick auf unserer + <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> + Satellitenkarte</a>. + </td> + </tr> +  + <tr> + <td height="12"> + </td> + </tr> +  + <tr> + <td colspan="3"> + <span class="headline"> + Besuchen Sie Samboja Lestari in Google Earth + </span> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Wenn die <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>Google Earth Software</a> + auf Ihrem Computer installiert ist, können Sie sich das Projektgebiet mit einer Auswahl verschiedener + Satelliten Bilder (aus dem Zeitraum 2000 - 2007) und vielen weiteren Informationen anschauen. + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Über diesen Link wird sich direkt Ihre Google Earth Applikation öffnen: + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> + <a shape="rect" class="more" href="/static/kml-root-de.kml"> + zu Google Earth + </a> + </td> + </tr> + </table> + </div> + </div> +</bknr:toplevel>

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/contract-tree.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3551 Author: ksprotte URL: http://bknr.net/trac/changeset/3551 contract-tree: removed annoying warning message that showed up, when contract-tree images were not yet rendered U trunk/projects/bos/web/contract-tree.lisp Modified: trunk/projects/bos/web/contract-tree.lisp =================================================================== --- trunk/projects/bos/web/contract-tree.lisp 2008-07-22 10:51:32 UTC (rev 3550) +++ trunk/projects/bos/web/contract-tree.lisp 2008-07-22 11:07:19 UTC (rev 3551) @@ -23,12 +23,10 @@ (first store-images) ;; We will just return NIL, if we cannot find one. ;; If there are too many, we will return the newest one and delete the rest. - (progn - (warn "~D store-images for ~S" (length store-images) node) - (let ((store-images-newest-first - (sort (copy-list store-images) #'> :key #'blob-timestamp))) - (mapc #'delete-object (rest store-images-newest-first)) - (first store-images-newest-first)))))) + (let ((store-images-newest-first + (sort (copy-list store-images) #'> :key #'blob-timestamp))) + (mapc #'delete-object (rest store-images-newest-first)) + (first store-images-newest-first))))) (defmethod initialize-instance :after ((node contract-node) &key args) (declare (ignore args))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/contract-tree.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3550 Author: ksprotte URL: http://bknr.net/trac/changeset/3550 better implementation for contract-tree-needs-update-p U trunk/projects/bos/web/contract-tree.lisp Modified: trunk/projects/bos/web/contract-tree.lisp =================================================================== --- trunk/projects/bos/web/contract-tree.lisp 2008-07-22 10:42:59 UTC (rev 3549) +++ trunk/projects/bos/web/contract-tree.lisp 2008-07-22 10:51:32 UTC (rev 3550) @@ -299,11 +299,7 @@ (map-nodes #'contract-node-update-image *contract-tree*)) (defun contract-tree-needs-update-p () - (map-nodes (lambda (node) (when (contract-node-update-image-needed-p node) - (return-from contract-tree-needs-update-p t))) - *contract-tree* - :order :breadth-first) - nil) + (contract-node-update-image-needed-p *contract-tree*)) ;;; image handler (defclass contract-tree-image-handler (page-handler)

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/contract-tree.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3549 Author: ksprotte URL: http://bknr.net/trac/changeset/3549 added CONTRACT-TREE-NEEDS-UPDATE-P U trunk/projects/bos/web/contract-tree.lisp Modified: trunk/projects/bos/web/contract-tree.lisp =================================================================== --- trunk/projects/bos/web/contract-tree.lisp 2008-07-22 09:48:51 UTC (rev 3548) +++ trunk/projects/bos/web/contract-tree.lisp 2008-07-22 10:42:59 UTC (rev 3549) @@ -298,6 +298,13 @@ (defun contract-tree-force-update-images () (map-nodes #'contract-node-update-image *contract-tree*)) +(defun contract-tree-needs-update-p () + (map-nodes (lambda (node) (when (contract-node-update-image-needed-p node) + (return-from contract-tree-needs-update-p t))) + *contract-tree* + :order :breadth-first) + nil) + ;;; image handler (defclass contract-tree-image-handler (page-handler) ())

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/poi-handlers.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3548 Author: ksprotte URL: http://bknr.net/trac/changeset/3548 WRITE-POI-XML now uses LANGUAGE and presents a correct Spenden link U trunk/projects/bos/web/poi-handlers.lisp Modified: trunk/projects/bos/web/poi-handlers.lisp =================================================================== --- trunk/projects/bos/web/poi-handlers.lisp 2008-07-22 09:35:08 UTC (rev 3547) +++ trunk/projects/bos/web/poi-handlers.lisp 2008-07-22 09:48:51 UTC (rev 3548) @@ -431,8 +431,10 @@ (attribute "title" (poi-string 'title)) (attribute "subtitle" (poi-string 'subtitle)) (with-element "menu" - (with-element "entry" (attribute "title" "Impressum") (attribute "href" "/de/impressum")) - (with-element "entry" (attribute "title" "Spenden") (attribute "href" "/de/spenden"))) + (with-element "entry" (attribute "title" "Impressum") + (attribute "href" (format nil "/~A/impressum" language))) + (with-element "entry" (attribute "title" "Spenden") + (attribute "href" (format nil "/~A/bestellung" language)))) (with-element "description" (text (poi-string 'description))) (with-media ("image_gallery" "Bildergalerie") (mapc #'format-image images))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/mail-generator.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3547 Author: ksprotte URL: http://bknr.net/trac/changeset/3547 fixed bug reported by vivian. "fehler bei ueberweisung ohne email Mir ist im Laufe der Tage folgendes aufgefallen: wenn ueberweiser keine emailadresse angeben und dann ueber den link aktiviert werden kommt eine Fehlermeldung die besag could not be proceeded, must contain domain bla.... Der Sponsor wird aber dann trotzdem als bezahlt eingerichtet und sein Profil erstellt. Diese Fehlermeldung muss heissen: "Sponsor processed, but not informed because no mail address" oder so was....." U trunk/projects/bos/m2/mail-generator.lisp Modified: trunk/projects/bos/m2/mail-generator.lisp =================================================================== --- trunk/projects/bos/m2/mail-generator.lisp 2008-07-22 08:56:46 UTC (rev 3546) +++ trunk/projects/bos/m2/mail-generator.lisp 2008-07-22 09:35:08 UTC (rev 3547) @@ -327,7 +327,7 @@ vorname name strasse plz ort email telefon (if want-print "yes" "no") (if donationcert-yearly "yes" "no") - *website-url* contract-id email)) + *website-url* contract-id (or email ""))) (make-contract-xml-part contract-id (all-request-params)) (make-vcard-part contract-id (make-vcard :sponsor-id sponsor-id :note (format nil "Paid-by: Manual money transfer

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/sat-tree.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3546 Author: ksprotte URL: http://bknr.net/trac/changeset/3546 small fix for an assertion in make-sat-layer highest local-draw-order is reserved for the contract-tree, so make-sat-layer checks that this last level is not used for the sat-layer U trunk/projects/bos/web/sat-tree.lisp Modified: trunk/projects/bos/web/sat-tree.lisp =================================================================== --- trunk/projects/bos/web/sat-tree.lisp 2008-07-22 08:50:30 UTC (rev 3545) +++ trunk/projects/bos/web/sat-tree.lisp 2008-07-22 08:56:46 UTC (rev 3546) @@ -185,7 +185,8 @@ (assert (geo-box-encloses-p *m2-geo-box* geo-box)) (check-type start-depth (integer 0)) (check-type local-draw-order (integer 0)) - (assert (< local-draw-order +max-num-of-local-draw-order-levels+)) + ;; highest local-draw-order is reserved for the contract-tree + (assert (< local-draw-order (1- +max-num-of-local-draw-order-levels+))) (when (find local-draw-order (class-instances 'sat-layer) :key #'local-draw-order) (cerror "create the new layer anyway" "There is already a sat-layer with the same local-draw-order '~A'." local-draw-order)) (let ((layer (make-object 'sat-layer :name name :geo-box geo-box :local-draw-order local-draw-order)))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/allocation.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3545 Author: ksprotte URL: http://bknr.net/trac/changeset/3545 need to write now bos.m2.allocation-cache::rebuild-cache in two exceptional places U trunk/projects/bos/m2/allocation.lisp Modified: trunk/projects/bos/m2/allocation.lisp =================================================================== --- trunk/projects/bos/m2/allocation.lisp 2008-07-22 08:45:49 UTC (rev 3544) +++ trunk/projects/bos/m2/allocation.lisp 2008-07-22 08:50:30 UTC (rev 3545) @@ -220,13 +220,13 @@ (deftransaction activate-allocation-area (area) (warn "activating ~S" area) (setf (slot-value area 'active-p) t) - (bos.m2.allocation-cache:rebuild-cache) + (bos.m2.allocation-cache::rebuild-cache) area) (deftransaction deactivate-allocation-area (area) (warn "deactivating ~S" area) (setf (slot-value area 'active-p) nil) - (bos.m2.allocation-cache:rebuild-cache) + (bos.m2.allocation-cache::rebuild-cache) area) ;;; FIXME can be optimized

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3544 Author: ksprotte URL: http://bknr.net/trac/changeset/3544 rebuild-cache should not be exported; fix for test ALLOCATION-AREA.TWO-AREAS U trunk/projects/bos/m2/packages.lisp U trunk/projects/bos/test/allocation.lisp Modified: trunk/projects/bos/m2/packages.lisp =================================================================== --- trunk/projects/bos/m2/packages.lisp 2008-07-22 08:35:04 UTC (rev 3543) +++ trunk/projects/bos/m2/packages.lisp 2008-07-22 08:45:49 UTC (rev 3544) @@ -289,7 +289,6 @@ (:export #:find-exact-match #:add-area #:count-cache-entries - #:pprint-cache - #:rebuild-cache + #:pprint-cache #:allocation-cache-subsystem)) Modified: trunk/projects/bos/test/allocation.lisp =================================================================== --- trunk/projects/bos/test/allocation.lisp 2008-07-22 08:35:04 UTC (rev 3543) +++ trunk/projects/bos/test/allocation.lisp 2008-07-22 08:45:49 UTC (rev 3544) @@ -76,8 +76,7 @@ (sponsor (make-sponsor :login "test-sponsor")) (total-free (+ 64 64))) (progn - (iter (while (> total-free 20)) - (bos.m2.allocation-cache:rebuild-cache) + (iter (while (> total-free 20)) (for size = (1+ (random 3))) (is (= total-free (+ (allocation-area-free-m2s area1) (allocation-area-free-m2s area2))))

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

bknr-cvs July 2008