[bknr-cvs] r1936 - branches/xml-class-rework/projects/bos/m2

[bknr at bknr.net]

Author: hhubner
Date: 2006-03-17 13:56:13 -0500 (Fri, 17 Mar 2006)
New Revision: 1936

Modified:
   branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp
Log:
Generate proper messages for stray fdf files


Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp
===================================================================
--- branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp	2006-03-17 18:41:27 UTC (rev 1935)
+++ branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp	2006-03-17 18:56:13 UTC (rev 1936)
@@ -13,14 +13,16 @@
   (handler-case
       (progn
         (ignore-errors (run-tool "recode" (list "utf-8..latin-1" (unix-namestring fdf-pathname))))
-        (if (unix-namestring pdf-pathname)
-            (run-tool "pdftk" (list (unix-namestring pdf-pathname)
-                                    "fill_form" (unix-namestring fdf-pathname)
-                                    "output" (namestring output-pathname)
-                                    "flatten"))
-            (warn "Warning, stray FDF file ~A deleted, no such contract exists" fdf-pathname))
-        (delete-file fdf-pathname)
-        (format t "; generated ~A~%" output-pathname))
+        (cond
+          ((unix-namestring pdf-pathname)
+           (run-tool "pdftk" (list (unix-namestring pdf-pathname)
+                                   "fill_form" (unix-namestring fdf-pathname)
+                                   "output" (namestring output-pathname)
+                                   "flatten"))
+           (format t "; generated ~A~%" output-pathname))
+          (t
+           (warn "Warning, stray FDF file ~A deleted, no such contract exists" fdf-pathname)))
+        (delete-file fdf-pathname))
     (error (e)
       (warn "While filling form ~A with ~A:~%~A" pdf-pathname fdf-pathname e))))