From 32cb032774135f2e260e84cb83ac1b724df716d6 Mon Sep 17 00:00:00 2001 From: David Lichteblau Date: Sun, 9 Mar 2008 21:31:21 +0100 Subject: [PATCH] base-uri fixes --- element.lisp | 2 +- xpath.lisp | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/element.lisp b/element.lisp index 18aa5d9..18dec15 100644 --- a/element.lisp +++ b/element.lisp @@ -565,7 +565,7 @@ (local-name (%local-name node)) (qname (qualified-name node)) (attrs (mapcar (lambda (a) - (sax:make-attribute + (sax:make-attribute :namespace-uri (namespace-uri a) :local-name (local-name a) :qname (qualified-name a) diff --git a/xpath.lisp b/xpath.lisp index 27dbe69..f2840a9 100644 --- a/xpath.lisp +++ b/xpath.lisp @@ -56,9 +56,15 @@ (define-default-method xpath-protocol:qualified-name ((node stp:node)) (qualified-name node)) -(define-default-method xpath-protocol:base-uri ((node stp:node)) +(define-default-method xpath-protocol:base-uri ((node stp:element)) + (stp:base-uri node)) + +(define-default-method xpath-protocol:base-uri ((node stp:document)) (stp:base-uri node)) +(define-default-method xpath-protocol:base-uri ((node stp:node)) + nil) + (define-default-method xpath-protocol:child-pipe ((node stp:node)) nil) @@ -85,6 +91,9 @@ prefix uri) +(define-default-method xpath-protocol:base-uri ((node stp-namespace)) + nil) + (define-default-method xpath-protocol:node-p ((node stp-namespace)) t) -- 2.11.4.GIT