Index: catalog.lisp
===================================================================
RCS file: /project/cxml/cvsroot/cxml/xml/catalog.lisp,v
retrieving revision 1.1.1.16
diff -u -r1.1.1.16 catalog.lisp
--- catalog.lisp	13 Mar 2005 18:02:56 -0000	1.1.1.16
+++ catalog.lisp	9 Jan 2006 00:03:29 -0000
@@ -222,8 +222,9 @@
 (defun parse-catalog-file (uri)
   (handler-case
       (parse-catalog-file/strict uri)
-    (file-error () nil)
-    (parser-error () nil)))
+    ((or file-error parser-error) (c)
+      (warn "ignoring catalog error: ~A" c)
+      nil)))
 
 (defparameter *catalog-dtd*
     (let* ((cxml
@@ -250,7 +251,7 @@
         (parse-stream s
                       (make-recoder (make-instance 'catalog-parser :uri uri)
                                     #'rod-to-utf8-string)
-                      :validate t
+                      :validate nil
                       :dtd (make-extid nil dtd-sysid)
                       :root #"catalog"
                       :entity-resolver #'entity-resolver)))))
@@ -284,7 +285,11 @@
   (setf lname (or lname qname))
   ;; we can dispatch on lnames only because we validate against the DTD,
   ;; which disallows other namespaces.
-  (push (string-or (get-attribute/lname "prefer" attrs) (prefer handler))
+  (push (let ((new (get-attribute/lname "prefer" attrs)))
+          (cond
+            ((equal new "public") :public)
+            ((equal new "system") :system)
+            ((null new) (prefer handler))))
         (prefer-stack handler))
   (push (string-or (get-attribute/lname "base" attrs) (base handler))
         (base-stack handler))