[bknr-cvs] hans changed trunk/
BKNR Commits
bknr at bknr.net
Tue Oct 14 10:32:35 UTC 2008
Revision: 3987
Author: hans
URL: http://bknr.net/trac/changeset/3987
Minor cosmetical fixes
Fix startup from Makefile
Repair certificate generation (not yet complete)
U trunk/bknr/datastore/src/utils/make-fdf-file.lisp
U trunk/projects/bos/Makefile
U trunk/projects/bos/m2/cert-daemon.lisp
U trunk/projects/bos/payment-website/templates/da/toplevel.xml
U trunk/projects/bos/payment-website/templates/de/toplevel.xml
U trunk/projects/bos/payment-website/templates/de/toplevel_news.xml
U trunk/projects/bos/payment-website/templates/en/toplevel.xml
D trunk/thirdparty/iconv/
Modified: trunk/bknr/datastore/src/utils/make-fdf-file.lisp
===================================================================
--- trunk/bknr/datastore/src/utils/make-fdf-file.lisp 2008-10-14 08:10:41 UTC (rev 3986)
+++ trunk/bknr/datastore/src/utils/make-fdf-file.lisp 2008-10-14 10:32:34 UTC (rev 3987)
@@ -3,7 +3,7 @@
;; make-fdf-file.lisp
;; Funktion zum Erstellen von FDF-Dateien. Diese können mit Hilfe von
-;; pdftk verwendet werden, um PDF-Formulare auszuföllen. Das
+;; pdftk verwendet werden, um PDF-Formulare auszufuellen. Das
;; FDF-Format ist dabei ein Unterformat von Adobe PDF und wird in der
;; PDF-Spezifikation beschrieben.
@@ -15,7 +15,7 @@
(regex-replace-all #?r"([\(\)\\])" string #?r"\\\1"))
(defun make-fdf-file (file-name &rest keys-and-values)
- (with-open-file (stream file-name :direction :output :if-does-not-exist :create :if-exists :supersede)
+ (with-open-file (stream file-name :direction :output :if-does-not-exist :create :if-exists :supersede :external-format :latin-1)
(format stream "%FDF-1.2
1 0 obj
<</FDF
@@ -23,11 +23,10 @@
[
")
(loop for (key value) on keys-and-values by #'cddr
- do (format stream " <</T(~(~a~))/V(~a)>>~%" key
- (pdf-quote-string (iconv:iconv "UTF-8" "ISO-8859-1"
- (if (stringp value)
- value
- (format nil "~a" value))))))
+ do (format stream " <</T(~(~a~))/V(~a)>>~%" key
+ (pdf-quote-string (if (stringp value)
+ value
+ (format nil "~a" value)))))
(format stream " ]
>>
>>
Modified: trunk/projects/bos/Makefile
===================================================================
--- trunk/projects/bos/Makefile 2008-10-14 08:10:41 UTC (rev 3986)
+++ trunk/projects/bos/Makefile 2008-10-14 10:32:34 UTC (rev 3987)
@@ -1,8 +1,11 @@
all: bos.core
.PHONY: all
+SBCL_BUILD=env LC_CTYPE=en_US.UTF-8 HOME=/home/bknr sbcl --dynamic-space-size 800 --no-userinit
+SBCL_RUN=env LC_CTYPE=en_US.ISO8859-1 sbcl --core bos.core --dynamic-space-size 800 --no-userinit
+
bos.core: build.lisp
- env LANG=en_US.UTF-8 sbcl --load build.lisp --eval '(sb-ext:save-lisp-and-die "bos.core")'
+ $(SBCL_BUILD) --load build.lisp --eval '(sb-ext:save-lisp-and-die "bos.core")'
# various cleaning stuff
.PHONY: cleancore
@@ -11,7 +14,7 @@
.PHONY: cleanfasl
cleanfasl:
- (cd ../.. && sbcl --disable-debugger --load clean.lisp --eval '(quit)')
+ (cd ../.. && sbcl --no-userinit --disable-debugger --load clean.lisp --eval '(quit)')
.PHONY: cleanall
cleanall: cleancore cleanfasl
@@ -21,11 +24,11 @@
.PHONY: start
start: bos.core
- sbcl --core bos.core --no-userinit --eval '(start)'
+ $(SBCL_RUN) --eval '(start)'
.PHONY: start-cert-daemon
start-cert-daemon: bos.core
- sbcl --core bos.core --no-userinit --eval '(bos.m2.cert-generator:cert-daemon)'
+ $(SBCL_RUN) --eval '(bos.m2.cert-generator:cert-daemon)'
# TAGS
TAGS:
Modified: trunk/projects/bos/m2/cert-daemon.lisp
===================================================================
--- trunk/projects/bos/m2/cert-daemon.lisp 2008-10-14 08:10:41 UTC (rev 3986)
+++ trunk/projects/bos/m2/cert-daemon.lisp 2008-10-14 10:32:34 UTC (rev 3987)
@@ -25,9 +25,7 @@
(warn "While filling form ~A with ~A:~%~A" pdf-pathname fdf-pathname e))))
(defun fill-forms (directory template-pathname)
- (dolist (fdf-pathname (remove "fdf" (cl-fad:list-directory directory)
- :test (complement #'string-equal)
- :key #'pathname-type))
+ (dolist (fdf-pathname (directory (merge-pathnames "*.fdf" directory)))
(handler-case
(destructuring-bind (id &optional (country "en"))
(split "-" (pathname-name fdf-pathname))
Modified: trunk/projects/bos/payment-website/templates/da/toplevel.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-10-14 08:10:41 UTC (rev 3986)
+++ trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-10-14 10:32:34 UTC (rev 3987)
@@ -58,7 +58,6 @@
kontakt
</a>
</div>
- <div>l</div>
</div>
</div>
<!-- /header and menu_top -->
Modified: trunk/projects/bos/payment-website/templates/de/toplevel.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-10-14 08:10:41 UTC (rev 3986)
+++ trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-10-14 10:32:34 UTC (rev 3987)
@@ -66,7 +66,6 @@
Kontakt
</a>
</div>
- <div>l</div>
</div>
</div>
<!-- /header and menu_top -->
Modified: trunk/projects/bos/payment-website/templates/de/toplevel_news.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-10-14 08:10:41 UTC (rev 3986)
+++ trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-10-14 10:32:34 UTC (rev 3987)
@@ -63,7 +63,6 @@
Kontakt
</a>
</div>
- <div>l</div>
</div>
<div id="menue_header_right" align="right">
<select name="language" style="width:125px;"
Modified: trunk/projects/bos/payment-website/templates/en/toplevel.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-10-14 08:10:41 UTC (rev 3986)
+++ trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-10-14 10:32:34 UTC (rev 3987)
@@ -68,7 +68,6 @@
contact
</a>
</div>
- <div>l</div>
</div>
</div>
<!-- /header and menu_top -->
More information about the Bknr-cvs
mailing list