[bknr-cvs] r2054 - in trunk/bknr/src: . utils web

[bknr at bknr.net]

Author: hhubner
Date: 2006-11-05 08:23:45 -0500 (Sun, 05 Nov 2006)
New Revision: 2054

Modified:
   trunk/bknr/src/bknr-utils.asd
   trunk/bknr/src/utils/make-fdf-file.lisp
   trunk/bknr/src/utils/package.lisp
   trunk/bknr/src/utils/utils.lisp
   trunk/bknr/src/web/web-utils.lisp
Log:
Misc small fixes and changes.


Modified: trunk/bknr/src/bknr-utils.asd
===================================================================
--- trunk/bknr/src/bknr-utils.asd	2006-11-04 08:50:05 UTC (rev 2053)
+++ trunk/bknr/src/bknr-utils.asd	2006-11-05 13:23:45 UTC (rev 2054)
@@ -20,7 +20,8 @@
 			      :cxml
 			      :md5
 			      #+(not allegro)
-			      :acl-compat)
+			      :acl-compat
+			      :iconv)
 
     :components ((:module "statistics" :components ((:file "package")
 						    (:file "runtime-statistics" :depends-on ("package"))))

Modified: trunk/bknr/src/utils/make-fdf-file.lisp
===================================================================
--- trunk/bknr/src/utils/make-fdf-file.lisp	2006-11-04 08:50:05 UTC (rev 2053)
+++ trunk/bknr/src/utils/make-fdf-file.lisp	2006-11-05 13:23:45 UTC (rev 2054)
@@ -2,8 +2,8 @@
 
 ;; 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
+;; Funktion zum Erstellen von FDF-Dateien.  Diese können mit Hilfe von
+;; pdftk verwendet werden, um PDF-Formulare auszuföllen.  Das
 ;; FDF-Format ist dabei ein Unterformat von Adobe PDF und wird in der
 ;; PDF-Spezifikation beschrieben.
 
@@ -23,7 +23,11 @@
   [
 ")
     (loop for (key value) on keys-and-values by #'cddr
-	  do (format stream "   <</T(~(~a~))/V(~a)>>~%" key (pdf-quote-string (if (stringp value) value (format nil "~a" value)))))
+	  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))))))
     (format stream "  ]
  >>
 >>

Modified: trunk/bknr/src/utils/package.lisp
===================================================================
--- trunk/bknr/src/utils/package.lisp	2006-11-04 08:50:05 UTC (rev 2053)
+++ trunk/bknr/src/utils/package.lisp	2006-11-05 13:23:45 UTC (rev 2054)
@@ -57,7 +57,6 @@
 	   #:find-neighbourhood
 	   #:group-by
 	   #:group-on
-	   #:flatten
 	   #:find-all
 	   #:genlist
 	   #:rotate

Modified: trunk/bknr/src/utils/utils.lisp
===================================================================
--- trunk/bknr/src/utils/utils.lisp	2006-11-04 08:50:05 UTC (rev 2053)
+++ trunk/bknr/src/utils/utils.lisp	2006-11-05 13:23:45 UTC (rev 2054)
@@ -269,13 +269,6 @@
     (loop for key being the hash-key of hash using (hash-value val)
 	  collect (cons key val))))
 
-(defun flatten (list)
-  (if (null list)
-      (list)
-      (if (atom (car list))
-	  (cons (car list) (flatten (cdr list)))
-	  (flatten (append (car list) (cdr list))))))
-
 (defun count-multiple (objects &rest keys)
   (let ((hash-tables (loop for i from 1 to (length keys)
 			   collect (make-hash-table :test #'equal)))

Modified: trunk/bknr/src/web/web-utils.lisp
===================================================================
--- trunk/bknr/src/web/web-utils.lisp	2006-11-04 08:50:05 UTC (rev 2053)
+++ trunk/bknr/src/web/web-utils.lisp	2006-11-05 13:23:45 UTC (rev 2054)
@@ -126,8 +126,7 @@
 
 (defun query-param (request param-name)
   (let ((value (cdr (assoc param-name (all-request-params request) :test #'string-equal))))
-    (when (and value
-	       (equal "" value))
+    (when (equal "" value)
       (setf value nil))
     value))