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

[bknr-cvs] r2128 - trunk/projects/bos/worldpay-test
by bknr＠bknr.net 16 Mar '07

16 Mar '07

Author: hhubner Date: 2007-03-16 11:24:19 -0500 (Fri, 16 Mar 2007) New Revision: 2128 Modified: trunk/projects/bos/worldpay-test/poi-handlers.lisp Log: Add content language chooser to POI image editor to help translators. Modified: trunk/projects/bos/worldpay-test/poi-handlers.lisp =================================================================== --- trunk/projects/bos/worldpay-test/poi-handlers.lisp 2007-03-04 10:25:03 UTC (rev 2127) +++ trunk/projects/bos/worldpay-test/poi-handlers.lisp 2007-03-16 16:24:19 UTC (rev 2128) @@ -287,6 +287,7 @@ (with-bos-cms-page (req :title "Edit POI Image") (html (cmslink (edit-object-url (poi-image-poi poi-image)) "Back to POI") + (content-language-chooser req) ((:form :method "post" :enctype "multipart/form-data") ((:input :type "hidden" :name "poi" :value poi)) (:table (:tr (:td "thumbnail")

1 0

[bknr-cvs] r2127 - in trunk/projects/bos: m2 payment-website/templates/da worldpay-test
by bknr＠bknr.net 04 Mar '07

04 Mar '07

Author: hhubner Date: 2007-03-04 05:25:03 -0500 (Sun, 04 Mar 2007) New Revision: 2127 Modified: trunk/projects/bos/m2/packages.lisp trunk/projects/bos/payment-website/templates/da/ueberweisung.xml trunk/projects/bos/worldpay-test/tags.lisp Log: Set country for manual transfers so that the right office receives the mail. Modified: trunk/projects/bos/m2/packages.lisp =================================================================== --- trunk/projects/bos/m2/packages.lisp 2007-03-02 07:12:13 UTC (rev 2126) +++ trunk/projects/bos/m2/packages.lisp 2007-03-04 10:25:03 UTC (rev 2127) @@ -97,6 +97,7 @@ #:get-contract #:contract-sponsor #:contract-paidp + #:contract-download-only #:contract-date #:contract-m2s #:contract-bounding-box Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-03-02 07:12:13 UTC (rev 2126) +++ trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-03-04 10:25:03 UTC (rev 2127) @@ -41,6 +41,7 @@ name="mailtransfer" id="mailtransfer" onsubmit="YY_checkform('mailtransfer','vorname','#q','0','Anuller venligst dette felt \'Fornavn\'.','name','#q','0','Anuller venligst dette felt \'Efternavn\'.','strasse','#q','0','Anuller venligst dette felt \'Gade/Nr.\'.','plz','#q','0','Anuller venligst dette felt \'Postnummer\'.','ort','#q','0','Anuller venligst dette felt \'Kommune\'.');return document.MM_returnValue"> + <input type="hidden" name="country" value="DK" /> <input type="hidden" name="contract-id" value="$(contract-id)" /> <input type="hidden" name="donationcert-yearly" value="$(donationcert-yearly)" /> <table id="formTable" width="95%" border="0" cellspacing="0" cellpadding="0"> Modified: trunk/projects/bos/worldpay-test/tags.lisp =================================================================== --- trunk/projects/bos/worldpay-test/tags.lisp 2007-03-02 07:12:13 UTC (rev 2126) +++ trunk/projects/bos/worldpay-test/tags.lisp 2007-03-04 10:25:03 UTC (rev 2127) @@ -110,11 +110,14 @@ (define-bknr-tag mail-transfer () (with-query-params ((get-template-var :request) + country contract-id name vorname strasse plz ort) (let* ((contract (store-object-with-id (parse-integer contract-id))) (download-only (< (contract-price contract) *mail-certificate-threshold*))) - (contract-set-download-only-p contract download-only) + (with-transaction (:prepare-before-mail) + (setf (contract-download-only contract) download-only) + (setf (sponsor-country (contract-sponsor contract)) country)) (contract-issue-cert contract (format nil "~A ~A" vorname name) :address (format nil "~A ~A~%~A~%~A ~A" vorname name

1 0

[bknr-cvs] r2126 - trunk/projects/bos/payment-website/templates/da
by bknr＠bknr.net 02 Mar '07

02 Mar '07

Author: hhubner Date: 2007-03-02 02:12:13 -0500 (Fri, 02 Mar 2007) New Revision: 2126 Modified: trunk/projects/bos/payment-website/templates/da/bestellung.xml trunk/projects/bos/payment-website/templates/da/ueberweisung.xml Log: Small textual fixes Modified: trunk/projects/bos/payment-website/templates/da/bestellung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/bestellung.xml 2007-01-15 11:43:49 UTC (rev 2125) +++ trunk/projects/bos/payment-website/templates/da/bestellung.xml 2007-03-02 07:12:13 UTC (rev 2126) @@ -159,7 +159,7 @@ <tr> <td align="right" colspan="3"> <input type="submit" class="form_big_bold" name="action" value="Doner online" onclick="return check_online();" /> - <input type="submit" class="form_big" name="action" value="overfør" onclick="return check_ueberweisung();" /> + <input type="submit" class="form_big" name="action" value="bankoverførsel" onclick="return check_ueberweisung();" /> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-01-15 11:43:49 UTC (rev 2125) +++ trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-03-02 07:12:13 UTC (rev 2126) @@ -60,7 +60,7 @@ </table> <strong>Vigtigt! Du skal anføre "SL ID $(contract-id)" på bankoverførslen, så vi kan genkende din betaling. </strong> <br /> <br /> - Meine Husk, at du selv står for overførslen via din bank til BOS Danmarks konto. + Husk, at du selv står for overførslen via din bank til BOS Danmarks konto. </td> </tr> <tr> @@ -120,7 +120,7 @@ <br /> Vi reserverer gerne det ønskede antal mÂ². Vi har brug for nogle personlige oplysninger for at kunne sende dig informationer om (regnskovsbevis, sponsorprofil, geografisk koordinater, bidragskvittering). -Når vi har modtaget bidraget, sender vi dig alle ovenfor nævnte informationer per brev eller e-mail. +Når vi har modtaget bidraget, sender vi dig alle ovenfor nævnte informationer eller e-mail. <br /><br /><br /> <strong>[Denne formular]</strong> <br />

1 0

[bknr-cvs] r2125 - trunk/projects/bos/worldpay-test
by bknr＠bknr.net 15 Jan '07

15 Jan '07

Author: hhubner Date: 2007-01-15 06:43:49 -0500 (Mon, 15 Jan 2007) New Revision: 2125 Modified: trunk/projects/bos/worldpay-test/tags.lisp Log: Change order text for danish sqm Modified: trunk/projects/bos/worldpay-test/tags.lisp =================================================================== --- trunk/projects/bos/worldpay-test/tags.lisp 2007-01-15 11:36:38 UTC (rev 2124) +++ trunk/projects/bos/worldpay-test/tags.lisp 2007-01-15 11:43:49 UTC (rev 2125) @@ -99,7 +99,7 @@ numsqm (case (make-keyword-from-string language) (:de "qm Regenwald in") - (:da "sqm Regnskov i") + (:da "m2 Regnskov i") (t "sqm rain forest in")))) (store-object-id sponsor) (sponsor-master-code sponsor)

1 0

[bknr-cvs] r2124 - trunk/projects/bos/payment-website/templates/da
by bknr＠bknr.net 15 Jan '07

15 Jan '07

Author: hhubner Date: 2007-01-15 06:36:38 -0500 (Mon, 15 Jan 2007) New Revision: 2124 Modified: trunk/projects/bos/payment-website/templates/da/bestellung.xml trunk/projects/bos/payment-website/templates/da/quittung.xml trunk/projects/bos/payment-website/templates/da/toplevel.xml trunk/projects/bos/payment-website/templates/da/toplevel_main.xml Log: Recent changes Modified: trunk/projects/bos/payment-website/templates/da/bestellung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/bestellung.xml 2007-01-15 10:04:19 UTC (rev 2123) +++ trunk/projects/bos/payment-website/templates/da/bestellung.xml 2007-01-15 11:36:38 UTC (rev 2124) @@ -19,7 +19,7 @@ <td colspan="2"> <span class="link_titlered"> Plant regnskov - <br></br>for kun 3,- Euro/24,- Kroner per m² + <br></br>for kun 3,- Euro/24,- kroner per m² </span> <br></br><br></br> </td> @@ -30,7 +30,7 @@ <td colspan="2"> Vi takker for din beslutning om støtte til Indonesiens folk, natur og dyreliv. <br></br><br></br> - Din støtte er et vigtig bidrag i kampen hen mod at sikre et holdbart projektarbejde i Samboja Lestari.<br></br> + Din støtte er et vigtigt bidrag i kampen hen mod at sikre et holdbart projektarbejde i Samboja Lestari.<br></br> <img src="/images/pfeil_link_on.gif" width="10" height="9" alt=""></img> <a href="idea_subtitle2" class="more"> ... mere @@ -71,21 +71,21 @@ <tr> <td colspan="3"> <input type="radio" name="numsqm" value="1" onclick="document.bestellformular.numsqm1.value = '';"></input> - 1 m² regnskov [3 Euro/24 Kroner], + 1 m² regnskov [3 Euro/24 kroner], <br></br> <input type="radio" name="numsqm" value="5" onclick="document.bestellformular.numsqm1.value = '';"></input> - 5 m² regnskov [15 Euro/120 Kroner], + 5 m² regnskov [15 Euro/120 kroner], <br></br> <input type="radio" name="numsqm" value="10" checked="checked" onclick="document.bestellformular.numsqm1.value = '';"></input> - 10 m² regnskov [30 Euro/240 Kroner], + 10 m² regnskov [30 Euro/240 kroner], <br></br> <input type="radio" name="numsqm" value="30" onclick="document.bestellformular.numsqm1.value = '';"></input> - 30 m² regnskov [90 Euro/720 Kroner], + 30 m² regnskov [90 Euro/720 kroner], <br></br> <input type="radio" name="numsqm" value=""></input> or <input type="text" name="numsqm1" size="5" value="" onfocus="document.bestellformular.numsqm[4].click()"></input> - m² [3 Euro/24 Kroner stk]. + m² [3 Euro/24 kroner stk]. <br></br> </td> </tr> @@ -159,7 +159,7 @@ <tr> <td align="right" colspan="3"> <input type="submit" class="form_big_bold" name="action" value="Doner online" onclick="return check_online();" /> - <input type="submit" class="form_big" name="action" value="overføre" onclick="return check_ueberweisung();" /> + <input type="submit" class="form_big" name="action" value="overfør" onclick="return check_ueberweisung();" /> </td> </tr> @@ -175,7 +175,7 @@ Startende med bare 1 m², modtager du <img src="/images/pfeil_link_on.gif" width="10" height="9" alt=""></img> <a href="javascript:window_extra('certificat')" class="more">vores regnskovs diplom</a> - som en pdf-fil fra din personlige sponsor-profil. + som en pdf-fil på din personlige sponsor-profil. <br></br><br></br><br></br> [<strong>Donations kvittering</strong>] <br></br> Modified: trunk/projects/bos/payment-website/templates/da/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/quittung.xml 2007-01-15 10:04:19 UTC (rev 2123) +++ trunk/projects/bos/payment-website/templates/da/quittung.xml 2007-01-15 11:36:38 UTC (rev 2124) @@ -47,7 +47,7 @@ <tr> <td></td> <td colspan="2"> - for din støtte og for din tilld til BOS. + for din støtte og for din tillid til BOS. <br></br><br></br> Kvardratmeterne du har sponseret er i gode hænder. </td> @@ -107,7 +107,7 @@ <tr> <td colspan="3" height="8"> <span class="help_text"> - Vi acceptere det intastede navn i dette felt. Vær venlig at ændre navnet om nødvendigt. + Vi accepterer det indtastede navn i dette felt. Vær venlig at ændre navnet om nødvendigt. </span> </td> </tr> @@ -134,9 +134,9 @@ <div id="content_right"> <div id="helpbox"> <br></br><br></br> - [<strong>Betalings-bekræftigelse</strong>] + [<strong>Betalingsbekræftigelse</strong>] <br></br> - Denne betalings-bekræftigelse fra WorldPay er allerede undervejs til din indbox. I den uventede situation at du ikke skulle modtage nogen besked, venligst kontakt: + Denne betalingsbekræftigelse fra WorldPay er allerede undervejs til din indboks. I den uventede situation at du ikke skulle modtage nogen besked, venligst kontakt: <br></br> <img src="/images/pfeil_link_on.gif" width="10" height="9" alt=""></img> @@ -152,7 +152,7 @@ <a href="javascript:window_extra('certificat')" class="more"> Regnskovs diplom </a> - som et pdf-download fra din personlige sponsor profil. + som et pdf-download på din personlige sponsor profil. <br /><br /><br /><br /><br /><br /> </div> </div> Modified: trunk/projects/bos/payment-website/templates/da/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel.xml 2007-01-15 10:04:19 UTC (rev 2123) +++ trunk/projects/bos/payment-website/templates/da/toplevel.xml 2007-01-15 11:36:38 UTC (rev 2124) @@ -36,7 +36,7 @@ <div>l</div> <div> <a href="bestellung" class="menue" title="Join us!"> - donation + donér </a> </div> <div>l</div> @@ -48,7 +48,7 @@ <div>l</div> <div> <a href="javascript:window_infosys()" class="menue" title="Move to satellite map."> - satellit kort + satellitkort </a> </div> <div>l</div> Modified: trunk/projects/bos/payment-website/templates/da/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2007-01-15 10:04:19 UTC (rev 2123) +++ trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2007-01-15 11:36:38 UTC (rev 2124) @@ -44,7 +44,7 @@ <div>l</div> <div> <a href="javascript:window_infosys()" class="menue" title="Move to satellite map."> - satellit kort + satellitkort </a> </div> <div>l</div> @@ -112,7 +112,7 @@ <tr> <td width="6"> </td> <td colspan="2"> - <strong>Satelit Kort</strong> + <strong>Satellitkort</strong> <br></br></td> <td></td> </tr>

1 0

[bknr-cvs] r2123 - trunk/projects/bos/payment-website/templates/da
by bknr＠bknr.net 15 Jan '07

15 Jan '07

Author: hhubner Date: 2007-01-15 05:04:19 -0500 (Mon, 15 Jan 2007) New Revision: 2123 Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml Log: Manual transfer data corrected. Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-01-08 14:43:36 UTC (rev 2122) +++ trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-01-15 10:04:19 UTC (rev 2123) @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <bknr:toplevel - title="REGENWALD für SAMBOJA LESTARI" + title="REGENSKOV i SAMBOJA LESTARI" xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:bos="http://headcraft.de/bos" @@ -40,27 +40,27 @@ enctype="application/x-www-form-urlencoded" name="mailtransfer" id="mailtransfer" - onsubmit="YY_checkform('mailtransfer','vorname','#q','0','Bitte das Feld \'Vorname\' ausfuellen.','name','#q','0','Bitte das Feld \'Name\' ausfuellen.','strasse','#q','0','Bitte das Feld \'Strasse\' ausfuellen.','plz','#q','0','Bitte das Feld \'PLZ\' ausfuellen.','ort','#q','0','Bitte das Feld \'Ort\' ausfuellen.');return document.MM_returnValue"> + onsubmit="YY_checkform('mailtransfer','vorname','#q','0','Anuller venligst dette felt \'Fornavn\'.','name','#q','0','Anuller venligst dette felt \'Efternavn\'.','strasse','#q','0','Anuller venligst dette felt \'Gade/Nr.\'.','plz','#q','0','Anuller venligst dette felt \'Postnummer\'.','ort','#q','0','Anuller venligst dette felt \'Kommune\'.');return document.MM_returnValue"> <input type="hidden" name="contract-id" value="$(contract-id)" /> <input type="hidden" name="donationcert-yearly" value="$(donationcert-yearly)" /> <table id="formTable" width="95%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td colspan="3"><span class="headline">Ich möchte meine Spende überweisen.</span></td> + <td colspan="3"><span class="headline">Jeg vil overføre mit bidrag til BOS Danmark via min bank!</span></td> </tr> <tr> <td colspan="3" height="7"> </td> </tr> <tr> <td colspan="3"> -Ich habe mich dazu entschieden einen Betrag von $(amount) Euro auf das Spendenkonto "Samboja Lestari" von BOS Deutschland e.V. zu überweisen. +Jeg har besluttet mig for at overføre et bidrag på $(amount) kroner til Samboja Lestari via BOS Danmark. <table border="0"> - <tr><td>Kontonummer:</td><td>32 10 100</td></tr> - <tr><td>Bank:</td><td>Bank für Sozialwirtschaft</td></tr> - <tr><td>BLZ:</td><td>100 205 00</td></tr> + <tr><td>Kontonummer:</td><td>0001718891</td></tr> + <tr><td>Bank:</td><td>Merkur Bank</td></tr> + <tr><td>Reg.Nr.:</td><td> 8401</td></tr> </table> - <strong>Bitte unbedingt den Verwendungszweck "SL ID $(contract-id)" auf dem Überweisungsformular angeben!</strong> + <strong>Vigtigt! Du skal anføre "SL ID $(contract-id)" på bankoverførslen, så vi kan genkende din betaling. </strong> <br /> <br /> - Meine Überweisung muss ich bei meiner Bank eigenständig veranlassen! + Meine Husk, at du selv står for overførslen via din bank til BOS Danmarks konto. </td> </tr> <tr> @@ -70,22 +70,22 @@ <td colspan="3" height="7"> </td> </tr> <tr> - <td height="10">Vorname:</td> + <td height="10">Fornavn:</td> <td width="10"></td> <td><input name="vorname" type="text" size="25" maxlength="30" /></td> </tr> <tr> - <td height="10">Name:</td> + <td height="10">Efternavn:</td> <td width="10"></td> <td><input name="name" type="text" size="25" maxlength="30" /></td> </tr> <tr> - <td height="10">Straße/Nr.:</td> + <td height="10">Gade/Nr.:</td> <td width="10"></td> <td><input name="strasse" type="text" size="25" maxlength="30" /></td> </tr> <tr> - <td height="10">PLZ/Ort</td> + <td height="10">Kommune:</td> <td width="10"></td> <td> <input name="plz" type="text" size="5" maxlength="5" /> @@ -107,7 +107,7 @@ </tr> <tr> <td align="right" colspan="3"> - <input type="submit" class="form_big" name="action" value="Angaben an BOS mailen" /> + <input type="submit" class="form_big" name="action" value="Oplysninger til BOS" /> </td> </tr> </table> @@ -116,31 +116,29 @@ </div> <div id="content_right"> <div id="helpbox"> - <strong>[Persönliche Daten]</strong> + <strong>[Personlige oplysninger]</strong> <br /> -Wir reservieren gerne die von Ihnen gewünschten m². Für die Zusendung -der entsprechenden Informationen (Regenwaldurkunde, Sponsorenprofil, -Geokoordinaten, Spendenbescheinigung) benötigen wir unbedingt die -Angabe Ihrer Daten. Nach erfolgter Überweisung erhalten Sie diese -Informationen schriftlich oder per E-Mail von uns. +Vi reserverer gerne det ønskede antal mÂ². +Vi har brug for nogle personlige oplysninger for at kunne sende dig informationer om (regnskovsbevis, sponsorprofil, geografisk koordinater, bidragskvittering). +Når vi har modtaget bidraget, sender vi dig alle ovenfor nævnte informationer per brev eller e-mail. <br /><br /><br /> - <strong>[Dieses Formular]</strong> + <strong>[Denne formular]</strong> <br /> - Bitte senden Sie dieses Formular per E-Mail direkt an uns. Sie können es auch + Send os venligst denne formular direkte per e-mail, eller <img src="/images/pfeil_link_on.gif" width="10" height="9" alt="" /> <a href="javascript:window.print();" class="more"> - ausdrucken + udskriv </a> - und per Fax oder Post an unsere - Kontaktadresse schicken: + den og send den til os per fax eller post: <br /><br /> - BOS Deutschland e.V. + BOS Danmark <br /> - Schöneberger Ufer 69 + Økologihuset, <br /> + Blegdamsvej 4b <br /> - 10785 Berlin + 2200 København N <br /><br /> - Fax: (030) 2636 7815 + Fax: +45 3537 3636 </div> </div> </div>

1 0

[bknr-cvs] r2122 - trunk/projects/bos/worldpay-test
by bknr＠bknr.net 08 Jan '07

08 Jan '07

Author: hhubner Date: 2007-01-08 09:43:36 -0500 (Mon, 08 Jan 2007) New Revision: 2122 Modified: trunk/projects/bos/worldpay-test/reports-xml-handler.lisp Log: Add new XML report handler all-contracts-m2s that includes sqm coordinates for the contracts. Modified: trunk/projects/bos/worldpay-test/reports-xml-handler.lisp =================================================================== --- trunk/projects/bos/worldpay-test/reports-xml-handler.lisp 2007-01-02 11:24:22 UTC (rev 2121) +++ trunk/projects/bos/worldpay-test/reports-xml-handler.lisp 2007-01-08 14:43:36 UTC (rev 2122) @@ -34,8 +34,7 @@ (error "invalid report name ~A" name)) arguments))))) - -(defreport all-contracts () +(defun all-contracts/internal (&key include-coords) (dolist (contract *contracts-to-process*) (with-element "contract" (attribute "id" (store-object-id contract)) @@ -44,8 +43,19 @@ (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)))))) + (attribute "sqm-count" (length (contract-m2s contract))) + (when include-coords + (dolist (m2 (contract-m2s contract)) + (with-element "m2" + (attribute "utm-x" (m2-x m2)) + (attribute "utm-y" (m2-y m2)))))))) +(defreport all-contracts () + (all-contracts/internal)) + +(defreport all-contracts-m2s () + (all-contracts/internal :include-coords t)) + (defun week-of-contract (contract) "Return Week key (YYYY-WW) for given contract." (multiple-value-bind (second minute hour date month year day-of-week is-dst tz) (decode-universal-time (contract-date contract))

1 0

[bknr-cvs] r2121 - trunk/projects/bos/m2
by bknr＠bknr.net 02 Jan '07

02 Jan '07

Author: hhubner Date: 2007-01-02 06:24:22 -0500 (Tue, 02 Jan 2007) New Revision: 2121 Modified: trunk/projects/bos/m2/cert-daemon.lisp trunk/projects/bos/m2/m2.lisp Log: Catch error message if certificate cannot be generated. Time out if certificate generator hangs, generating an error message to the sponsor. Modified: trunk/projects/bos/m2/cert-daemon.lisp =================================================================== --- trunk/projects/bos/m2/cert-daemon.lisp 2006-12-19 05:35:36 UTC (rev 2120) +++ trunk/projects/bos/m2/cert-daemon.lisp 2007-01-02 11:24:22 UTC (rev 2121) @@ -31,14 +31,17 @@ (dolist (fdf-pathname (remove "fdf" (directory directory) :test (complement #'string-equal) :key #'pathname-type)) - (destructuring-bind (id &optional (country "en")) (split "-" (pathname-name fdf-pathname)) - (let ((language-specific-template-pathname (merge-pathnames (make-pathname :name (format nil "~A-~A" (pathname-name template-pathname) country)) - template-pathname)) - (output-pathname (merge-pathnames (make-pathname :name id :type "pdf") fdf-pathname))) - (fill-form fdf-pathname (if (probe-file language-specific-template-pathname) - language-specific-template-pathname - template-pathname) - output-pathname))))) + (handler-case + (destructuring-bind (id &optional (country "en")) (split "-" (pathname-name fdf-pathname)) + (let ((language-specific-template-pathname (merge-pathnames (make-pathname :name (format nil "~A-~A" (pathname-name template-pathname) country)) + template-pathname)) + (output-pathname (merge-pathnames (make-pathname :name id :type "pdf") fdf-pathname))) + (fill-form fdf-pathname (if (probe-file language-specific-template-pathname) + language-specific-template-pathname + template-pathname) + output-pathname))) + (error (e) + (format "Error generating certificate from file ~A: ~A~%" fdf-pathname e))))) (defun generate-certs () (fill-forms *cert-mail-directory* *cert-mail-template*) Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2006-12-19 05:35:36 UTC (rev 2120) +++ trunk/projects/bos/m2/m2.lisp 2007-01-02 11:24:22 UTC (rev 2121) @@ -266,12 +266,13 @@ (make-certificate contract name :address address :language language) (unless (contract-download-only-p contract) (make-certificate contract name :address address :language language :print t)) - (loop - do (progn - (format t "~&; waiting for generation of certificate, contract-id ~A" (store-object-id contract)) - (sleep 2)) - until (probe-file (contract-pdf-pathname contract))) - (change-slot-values contract 'cert-issued t)))) + (dotimes (i 10) + (when (probe-file (contract-pdf-pathname contract)) + (return)) + (sleep 1)) + (if (probe-file (contract-pdf-pathname contract)) + (change-slot-values contract 'cert-issued t) + (error "Cannot generate certificate"))))) (defmethod contract-image-tiles ((contract contract)) (let (image-tiles)

1 0

[bknr-cvs] r2120 - trunk/projects/bos/m2
by bknr＠bknr.net 19 Dec '06

19 Dec '06

Author: hhubner Date: 2006-12-19 00:35:36 -0500 (Tue, 19 Dec 2006) New Revision: 2120 Modified: trunk/projects/bos/m2/mail-generator.lisp Log: typo corrected Modified: trunk/projects/bos/m2/mail-generator.lisp =================================================================== --- trunk/projects/bos/m2/mail-generator.lisp 2006-12-19 05:34:37 UTC (rev 2119) +++ trunk/projects/bos/m2/mail-generator.lisp 2006-12-19 05:35:36 UTC (rev 2120) @@ -214,7 +214,7 @@ (let ((parts (list (make-html-part (format nil " <html> <body> - <h1>Manuell erfasste Sponsordate:</h1> + <h1>Manuell erfasste Sponsordaten:</h1> <table border=\"1\"> <tr><td>Contract-ID</td><td>~@[~A~]</td></tr> <tr><td>Anzahl sqm</td><td>~A</td></tr>

1 0

[bknr-cvs] r2119 - trunk/projects/bos/payment-website/infosystem
by bknr＠bknr.net 19 Dec '06

19 Dec '06

Author: hhubner Date: 2006-12-19 00:34:37 -0500 (Tue, 19 Dec 2006) New Revision: 2119 Modified: trunk/projects/bos/payment-website/infosystem/javascript.js Log: Further fix for off-by-one error in month display. Modified: trunk/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/javascript.js 2006-12-19 05:16:17 UTC (rev 2118) +++ trunk/projects/bos/payment-website/infosystem/javascript.js 2006-12-19 05:34:37 UTC (rev 2119) @@ -182,7 +182,7 @@ B(anzahlVerkauft), BR(), BR(), msg('Letzter Sponsor'), BR(), B(sponsor.name, BR()), - '(' + sponsor.date.getDate() + "." + sponsor.date.getMonth() + "." + ' - ' + sponsor.country + ' - ' + sponsor.count + ' m²)'); + '(' + sponsor.date.getDate() + "." + (sponsor.date.getMonth() + 1) + "." + ' - ' + sponsor.country + ' - ' + sponsor.count + ' m²)'); } function poi_fertig(_poi, _anzahlSponsoren, _anzahlVerkauft) {

1 0