From 1cc473b9183a9529ebc2298febe7268a46fd2fdb Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Fri, 8 Feb 2008 21:43:12 +0000 Subject: [PATCH] represent base uris as strings, not puri objects --- klacks/klacks-impl.lisp | 5 ++++- xml/xml-parse.lisp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/klacks/klacks-impl.lisp b/klacks/klacks-impl.lisp index 28076b9..50b136b 100644 --- a/klacks/klacks-impl.lisp +++ b/klacks/klacks-impl.lisp @@ -490,7 +490,10 @@ nil))) (defmethod klacks:current-xml-base ((source cxml-source)) - (car (base-stack (slot-value source 'context)))) + (let ((x (car (base-stack (slot-value source 'context))))) + (if (stringp x) + x + (puri:render-uri x nil)))) (defmethod klacks:map-current-namespace-declarations (fn (source cxml-source)) (loop diff --git a/xml/xml-parse.lisp b/xml/xml-parse.lisp index ddf6aab..5b30cfa 100644 --- a/xml/xml-parse.lisp +++ b/xml/xml-parse.lisp @@ -692,7 +692,10 @@ nil))) (defmethod sax:xml-base ((parser cxml-parser)) - (car (base-stack (slot-value parser 'ctx)))) + (let ((uri (car (base-stack (slot-value parser 'ctx))))) + (if (stringp uri) + uri + (puri:render-uri uri nil)))) (defvar *validate* t) (defvar *external-subset-p* nil)