Update of /project/cxml/cvsroot/cxml/xml
In directory clnet:/tmp/cvs-serv17669
Modified Files:
xml-parse.lisp
Log Message:
relative dateinamen absolutifizieren, damit wir sie in entity urls mergen
koennen (thanks to Holger Schauer for the report)
--- /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/01/23 21:45:48 1.59
+++ /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/03/20 12:42:26 1.60
@@ -2978,7 +2978,7 @@
(make-stream-name
:entity-name "main document"
:entity-kind :main
- :uri (pathname-to-uri filename)))
+ :uri (pathname-to-uri (merge-pathnames filename))))
(apply #'parse-xstream input handler args)))
(defun resolve-synonym-stream (stream)
@@ -2991,7 +2991,7 @@
;; ignore-errors, because sb-bsd-sockets creates instances of
;; FILE-STREAMs that aren't
(ignore-errors (pathname stream)))
- (pathname-to-uri (pathname stream))
+ (pathname-to-uri (merge-pathnames (pathname stream)))
nil))
(defun parse-stream (stream handler &rest args)
