[bknr-cvs] r1859 - branches/xml-class-rework/bknr/src/web

[bknr at bknr.net]

Author: hhubner
Date: 2006-02-19 12:49:24 -0600 (Sun, 19 Feb 2006)
New Revision: 1859

Modified:
   branches/xml-class-rework/bknr/src/web/templates.lisp
Log:
change addition of environmental catalog


Modified: branches/xml-class-rework/bknr/src/web/templates.lisp
===================================================================
--- branches/xml-class-rework/bknr/src/web/templates.lisp	2006-02-19 18:44:08 UTC (rev 1858)
+++ branches/xml-class-rework/bknr/src/web/templates.lisp	2006-02-19 18:49:24 UTC (rev 1859)
@@ -9,10 +9,13 @@
 (defvar *template-dtd-catalog* `(;; libxml standard
                                  "/etc/xml/catalog"
                                  ;; FreeBSD
-                                 "/usr/local/share/xml/catalog.ports"
-                                 ;; Find from environment
-                                 ,@(cdr (assoc :xmlcatalog ext:*environment-list*))))
+                                 "/usr/local/share/xml/catalog.ports"))
 
+(eval-when (:load-toplevel :execute)
+  (let ((env-catalog (assoc :xmlcatalog exto:*environment-list*)))
+    (when env-catalog
+      (pushnew *template-dtd-catalog* env-catalog :test #'equal))))
+
 ;; user-error is supposed to be raised when an error is provoced by
 ;; the user (i.e. by supplying invalid form data).