cxml-cvs

cxml-cvs@common-lisp.net

425 discussions

[cxml-cvs] CVS update: cxml/doc/using.html
by dlichteblau＠common-lisp.net 12 Dec '05

12 Dec '05

Update of /project/cxml/cvsroot/cxml/doc In directory common-lisp.net:/tmp/cvs-serv31040/doc Modified Files: using.html Log Message: namespace normalization Date: Mon Dec 12 00:56:47 2005 Author: dlichteblau Index: cxml/doc/using.html diff -u cxml/doc/using.html:1.4 cxml/doc/using.html:1.5 --- cxml/doc/using.html:1.4 Mon Dec 12 00:31:39 2005 +++ cxml/doc/using.html Mon Dec 12 00:56:46 2005 @@ -156,12 +156,6 @@ </p> <p> - <div class="def">Function DOM:MAKE-DOM-BUILDER ()</div> - Create a SAX handler which builds a DOM document.  Example: - </p> - <pre>(cxml:parse-file "test.xml" (dom:make-dom-builder))</pre> - - <p> <div class="def">Condition class CXML:XML-PARSE-ERROR ()</div> Superclass of all conditions signalled by the CXML parser. </p> @@ -183,7 +177,8 @@ <p> <div class="def">Function CXML:UNPARSE-DOCUMENT (document stream &rest keys)</div> <div class="def">Function CXML:UNPARSE-DOCUMENT-TO-OCTETS (document &rest keys) => vector</div> - Serialize a DOM document object. + Serialize a DOM document object. These convenience functions are + wrappers around <tt>dom:map-document</tt>. </p> <ul> <li><tt>document</tt> -- a DOM document object</li> @@ -224,6 +219,10 @@ does not matter to the application. </p> <p> + If namespace support is enabled (the default), these functions use + a namespace normalizer (<tt>cxml:make-namespace-normalizer</tt>). + </p> + <p> <tt>unparse-document-to-octets</tt> returns an <tt>(unsigned-byte 8)</tt> array, whereas <tt>unparse-document</tt> writes characters.  <tt>unparse-document</tt> is useful together @@ -247,7 +246,7 @@ </p> <p> - <div class="def">Macro CXML:WITH-XML-OUTPUT (sink &body body) => vector</div> + <div class="def">Macro CXML:WITH-XML-OUTPUT (sink &body body) => sink-specific result</div> <div class="def">Macro CXML:WITH-ELEMENT (qname &body body) => result</div> <div class="def">Function CXML:ATTRIBUTE (name value) => value</div> <div class="def">Function CXML:TEXT (data) => data</div> @@ -320,12 +319,6 @@ (dom:map-document (cxml:make-validator x #"foo") d))</pre> <p> - <div class="def">Function DOM:MAP-DOCUMENT (handler document &key include-xmlns-attributes include-default-values)</div> - Traverse a DOM document and call SAX functions as if an XML - representation of the document were processed by a SAX parser. - </p> - - <p> <div class="def">Class CXML:SAX-PROXY ()</div> <div class="def">Accessor CXML:PROXY-CHAINED-HANDLER</div> <tt>sax-proxy</tt> is a SAX handler which passes all events it @@ -338,6 +331,17 @@ handler unmodified. </p> + <p> + <div class="def">Accessor CXML:MAKE-NAMESPACE-NORMALIZER (next-handler)</div> + </p> + <p> + Return a SAX handler that performs <a + href="http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/namespaces-algorith…">DOM + 3-style namespace normalization</a> on Attribute lists in + <tt>start-element</tt> events before passing them on the next + handler. + </p> + <a name="xmls"/> <h3>XMLS Compatibility</h3> <p> @@ -649,19 +653,45 @@ <a name="dom"/> <h2>DOM Notes</h2> <p> - CXML implements the DOM Level 2 Core interfaces.  Explaining - DOM is better left to the <a - href="http://www.w3.org/TR/DOM-Level-2-Core/core.html">specification</a>, - so please refer to the official W3C documents for DOM. + CXML implements the DOM Level 2 Core interfaces.  For details + on DOM, please refer to the <a + href="http://www.w3.org/TR/DOM-Level-2-Core/core.html">specification</a>. </p> <p> - However, there is no "standard" DOM mapping for Lisp.  DOM + However, note that there is no "standard" DOM mapping for Lisp.  DOM is <a href="http://www.w3.org/TR/DOM-Level-2-Core/idl-definitions.html">specified in CORBA IDL</a>, but it refrains from using object-oriented IDL features, allowing for a much more natural Lisp implemenation than - the the ordinary IDL/Lisp mapping would. + the the ordinary IDL/Lisp mapping would. The mapping chosen for + cxml is explained below. </p> + + <h3>Example</h3> + <pre>XML(97): (dom:node-type + (dom:document-element + (cxml:parse-file "~/test.xml" (dom:make-dom-builder)))) +:ELEMENT</pre> + + <h3>CXML-specific functions</h3> + <p> + <div class="def">Function DOM:MAKE-DOM-BUILDER ()</div> + Create a SAX handler which builds a DOM document.  Example: + </p> + <pre>(cxml:parse-file "test.xml" (dom:make-dom-builder))</pre> + + <p> + <div class="def">Function DOM:MAP-DOCUMENT (handler document &key include-xmlns-attributes include-default-values)</div> + Traverse a DOM document and call SAX functions as if an XML + representation of the document were processed by a SAX parser. + </p> + <p> + <tt>dom:map-document</tt> is the low-level building-block used to + implement the <a href="#serialization">serialization functions</a> + like <tt>unparse-document</tt>, but can also be used directly. + </p> + + <h3>DOM/Lisp mapping</h3> <p> Differences between CXML's DOM and the direct IDL/Lisp mapping: </p> @@ -715,10 +745,5 @@ <tt>dom:do-node-list</tt>, which can be implemented portably. </li> </ul> - <p>Example:</p> - <pre>XML(97): (dom:node-type - (dom:document-element - (cxml:parse-file "~/test.xml" (dom:make-dom-builder)))) -:ELEMENT</pre> </body> </html>

1 0

[cxml-cvs] CVS update: cxml/README.html cxml/cxml.asd
by dlichteblau＠common-lisp.net 12 Dec '05

12 Dec '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv31040 Modified Files: README.html cxml.asd Log Message: namespace normalization Date: Mon Dec 12 00:56:46 2005 Author: dlichteblau Index: cxml/README.html diff -u cxml/README.html:1.11 cxml/README.html:1.12 --- cxml/README.html:1.11 Mon Dec 12 00:31:36 2005 +++ cxml/README.html Mon Dec 12 00:56:45 2005 @@ -90,7 +90,12 @@ <h2>Recent Changes</h2> <p class="nomargin"><tt>rel-2005-xx-yy</tt></p> <ul class="nomargin"> - <li>Implemented DOM 2 Core.</li> + <li> + Implemented DOM 2 Core. + (A handler for DOM 3-style namespace normalization is provided and + used by default for serialization of DOM documents if namespace + support is enabled.) + </li> <li> Error handling overhaul: All syntax errors should now be reported as instances of <tt>well-formedness-violation</tt>. We Index: cxml/cxml.asd diff -u cxml/cxml.asd:1.6 cxml/cxml.asd:1.7 --- cxml/cxml.asd:1.6 Sat Nov 26 22:48:16 2005 +++ cxml/cxml.asd Mon Dec 12 00:56:45 2005 @@ -68,6 +68,7 @@ (:file "unparse" :depends-on ("xml-parse")) (:file "xmls-compat" :depends-on ("xml-parse")) (:file "recoder" :depends-on ("xml-parse")) + (:file "xmlns-normalizer" :depends-on ("xml-parse")) (:file "catalog" :depends-on ("xml-parse")) (:file "sax-proxy" :depends-on ("xml-parse"))) :depends-on (:cxml-runes :puri :trivial-gray-streams))

1 0

[cxml-cvs] CVS update: cxml/doc/using.html
by dlichteblau＠common-lisp.net 12 Dec '05

12 Dec '05

Update of /project/cxml/cvsroot/cxml/doc In directory common-lisp.net:/tmp/cvs-serv29111/doc Modified Files: using.html Log Message: na wer sagt's denn. DOM 2 Core Date: Mon Dec 12 00:31:39 2005 Author: dlichteblau Index: cxml/doc/using.html diff -u cxml/doc/using.html:1.3 cxml/doc/using.html:1.4 --- cxml/doc/using.html:1.3 Sun Dec 4 19:43:53 2005 +++ cxml/doc/using.html Mon Dec 12 00:31:39 2005 @@ -649,15 +649,15 @@ <a name="dom"/> <h2>DOM Notes</h2> <p> - CXML implements the DOM Level 1 Core interfaces.  Explaining + CXML implements the DOM Level 2 Core interfaces.  Explaining DOM is better left to the <a - href="http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html">specification</a>, + href="http://www.w3.org/TR/DOM-Level-2-Core/core.html">specification</a>, so please refer to the official W3C documents for DOM. </p> <p> However, there is no "standard" DOM mapping for Lisp.  DOM is <a - href="http://www.w3.org/TR/REC-DOM-Level-1/idl-definitions.html">specified + href="http://www.w3.org/TR/DOM-Level-2-Core/idl-definitions.html">specified in CORBA IDL</a>, but it refrains from using object-oriented IDL features, allowing for a much more natural Lisp implemenation than the the ordinary IDL/Lisp mapping would.

1 0

[cxml-cvs] CVS update: cxml/README.html
by dlichteblau＠common-lisp.net 12 Dec '05

12 Dec '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv29111 Modified Files: README.html Log Message: na wer sagt's denn. DOM 2 Core Date: Mon Dec 12 00:31:38 2005 Author: dlichteblau Index: cxml/README.html diff -u cxml/README.html:1.10 cxml/README.html:1.11 --- cxml/README.html:1.10 Sun Dec 4 19:43:49 2005 +++ cxml/README.html Mon Dec 12 00:31:36 2005 @@ -70,7 +70,7 @@ validating SAX-like <a href="http://www.w3.org/TR/2000/REC-xml-20001006">XML 1.0</a> parser as well as the <a - href="http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html">DOM Level 1 Core</a> + href="http://www.w3.org/TR/DOM-Level-2-Core/">DOM Level 2 Core</a> interfaces. </p> @@ -90,7 +90,7 @@ <h2>Recent Changes</h2> <p class="nomargin"><tt>rel-2005-xx-yy</tt></p> <ul class="nomargin"> - <li>Use trivial-gray-streams.</li> + <li>Implemented DOM 2 Core.</li> <li> Error handling overhaul: All syntax errors should now be reported as instances of <tt>well-formedness-violation</tt>. We @@ -98,6 +98,7 @@ </li> <li>Support internal subset serialization.</li> <li>Gilbert Baumann has clarified the license as Lisp-LGPL.</li> + <li>Use trivial-gray-streams.</li> </ul> <p class="nomargin"><tt>rel-2005-06-25</tt></p> <ul class="nomargin">

1 0

[cxml-cvs] CVS update: cxml/dom/dom-impl.lisp
by dlichteblau＠common-lisp.net 11 Dec '05

11 Dec '05

Update of /project/cxml/cvsroot/cxml/dom In directory common-lisp.net:/tmp/cvs-serv12268/dom Modified Files: dom-impl.lisp Log Message: 755/808 nodenormalize01.xml -TEST FAILED: NOT_SUPPORTED_ERR (9): -No entity resolver registered. Date: Sun Dec 11 21:13:05 2005 Author: dlichteblau Index: cxml/dom/dom-impl.lisp diff -u cxml/dom/dom-impl.lisp:1.30 cxml/dom/dom-impl.lisp:1.31 --- cxml/dom/dom-impl.lisp:1.30 Sun Dec 11 21:07:45 2005 +++ cxml/dom/dom-impl.lisp Sun Dec 11 21:13:05 2005 @@ -1193,11 +1193,10 @@ (let* ((owner (dom:owner-document instance)) (handler (dom:make-dom-builder)) (resolver (slot-value owner 'entity-resolver))) - (unless resolver - (dom-error :NOT_SUPPORTED_ERR "No entity resolver registered.")) - (setf (document handler) owner) - (push instance (element-stack handler)) - (funcall resolver (dom:name instance) handler)) + (when resolver + (setf (document handler) owner) + (push instance (element-stack handler)) + (funcall resolver (dom:name instance) handler))) (labels ((walk (n) (setf (slot-value n 'read-only-p) t) (when (dom:element-p n)

1 0

[cxml-cvs] CVS update: cxml/DOMTEST
by dlichteblau＠common-lisp.net 11 Dec '05

11 Dec '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv12268 Modified Files: DOMTEST Log Message: 755/808 nodenormalize01.xml -TEST FAILED: NOT_SUPPORTED_ERR (9): -No entity resolver registered. Date: Sun Dec 11 21:13:04 2005 Author: dlichteblau Index: cxml/DOMTEST diff -u cxml/DOMTEST:1.31 cxml/DOMTEST:1.32 --- cxml/DOMTEST:1.31 Sun Dec 11 21:07:44 2005 +++ cxml/DOMTEST Sun Dec 11 21:13:04 2005 @@ -786,8 +786,6 @@ 753/808 nodeissupported04.xml 754/808 nodeissupported05.xml 755/808 nodenormalize01.xml -TEST FAILED: NOT_SUPPORTED_ERR (9): -No entity resolver registered. 756/808 nodesetprefix01.xml 757/808 nodesetprefix02.xml 758/808 nodesetprefix03.xml @@ -839,4 +837,4 @@ 803/808 setNamedItemNS04.xml 804/808 setNamedItemNS05.xml 805/808 systemId01.xml -1/763 tests failed; 45 tests were skipped \ No newline at end of file +0/763 tests failed; 45 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/DOMTEST
by dlichteblau＠common-lisp.net 11 Dec '05

11 Dec '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv12188 Modified Files: DOMTEST Log Message: 687/808 importNode11.xml -TEST FAILED: NOT_SUPPORTED_ERR (9): -not implemented Date: Sun Dec 11 21:07:44 2005 Author: dlichteblau Index: cxml/DOMTEST diff -u cxml/DOMTEST:1.30 cxml/DOMTEST:1.31 --- cxml/DOMTEST:1.30 Sun Dec 11 21:04:06 2005 +++ cxml/DOMTEST Sun Dec 11 21:07:44 2005 @@ -718,8 +718,6 @@ 685/808 importNode09.xml 686/808 importNode10.xml 687/808 importNode11.xml -TEST FAILED: NOT_SUPPORTED_ERR (9): -not implemented 688/808 importNode12.xml 689/808 importNode13.xml 690/808 importNode14.xml @@ -841,4 +839,4 @@ 803/808 setNamedItemNS04.xml 804/808 setNamedItemNS05.xml 805/808 systemId01.xml -2/763 tests failed; 45 tests were skipped \ No newline at end of file +1/763 tests failed; 45 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/dom/dom-impl.lisp
by dlichteblau＠common-lisp.net 11 Dec '05

11 Dec '05

Update of /project/cxml/cvsroot/cxml/dom In directory common-lisp.net:/tmp/cvs-serv12188/dom Modified Files: dom-impl.lisp Log Message: 687/808 importNode11.xml -TEST FAILED: NOT_SUPPORTED_ERR (9): -not implemented Date: Sun Dec 11 21:07:45 2005 Author: dlichteblau Index: cxml/dom/dom-impl.lisp diff -u cxml/dom/dom-impl.lisp:1.29 cxml/dom/dom-impl.lisp:1.30 --- cxml/dom/dom-impl.lisp:1.29 Sun Dec 11 21:04:06 2005 +++ cxml/dom/dom-impl.lisp Sun Dec 11 21:07:45 2005 @@ -1344,12 +1344,8 @@ (defmethod dom:import-node ((document document) (node entity-reference) deep) (declare (ignore deep)) - #+(or) (import-node-internal 'entity-reference document node nil - :name (dom:name node)) - ;; XXX If the document being imported into provides a definition for - ;; this entity name, its value is assigned. - (dom-error :NOT_SUPPORTED_ERR "not implemented")) + :name (dom:name node))) (defmethod dom:import-node ((document document) (node notation) deep) (import-node-internal 'notation document node deep

1 0

[cxml-cvs] CVS update: cxml/dom/dom-impl.lisp
by dlichteblau＠common-lisp.net 11 Dec '05

11 Dec '05

Update of /project/cxml/cvsroot/cxml/dom In directory common-lisp.net:/tmp/cvs-serv12142/dom Modified Files: dom-impl.lisp Log Message: 782/808 removeAttributeNS02.xml -TEST FAILED: There is no applicable method for the generic function - #<STANDARD-GENERIC-FUNCTION DOM:NAMESPACE-URI (2)> - when called with arguments - (NIL). Date: Sun Dec 11 21:04:07 2005 Author: dlichteblau Index: cxml/dom/dom-impl.lisp diff -u cxml/dom/dom-impl.lisp:1.28 cxml/dom/dom-impl.lisp:1.29 --- cxml/dom/dom-impl.lisp:1.28 Sun Dec 11 20:54:57 2005 +++ cxml/dom/dom-impl.lisp Sun Dec 11 21:04:06 2005 @@ -1039,19 +1039,23 @@ (unless (find old-attr items) (dom-error :NOT_FOUND_ERR "Attribute not found.")) (setf items (remove old-attr items)) - (maybe-add-default-attribute element (dom:name old-attr)) + (maybe-add-default-attribute element old-attr) old-attr)) ;; eek, defaulting: -(defun maybe-add-default-attribute (element name) - (let* ((dtd (dtd (slot-value element 'owner))) +(defun maybe-add-default-attribute (element old-attr) + (let* ((qname (dom:name old-attr)) + (dtd (dtd (slot-value element 'owner))) (e (when dtd (cxml::find-element (cxml::rod (dom:tag-name element)) dtd))) - (a (when e (cxml::find-attribute e name)))) + (a (when e (cxml::find-attribute e qname)))) (when (and a (listp (cxml::attdef-default a))) - (add-default-attribute element a)))) + (let ((new (add-default-attribute element a))) + (setf (slot-value new 'namespace-uri) (dom:namespace-uri old-attr)) + (setf (slot-value new 'prefix) (dom:prefix old-attr)) + (setf (slot-value new 'local-name) (dom:local-name old-attr)))))) (defun add-default-attributes (element) (let* ((dtd (dtd (slot-value element 'owner))) @@ -1065,7 +1069,16 @@ (not (dom:get-attribute-node element (cxml::attdef-name a)))) - (add-default-attribute element a)))))) + (let ((anode (add-default-attribute element a))) + (multiple-value-bind (prefix local-name) + (handler-case + (cxml::split-qname (cxml::attdef-name a)) + (cxml:well-formedness-violation (c) + (dom-error :NAMESPACE_ERR "~A" c))) + ;; das ist fuer importnode07. + ;; so richtig ueberzeugend finde ich das ja nicht. + (setf (slot-value anode 'prefix) prefix) + (setf (slot-value anode 'local-name) local-name)))))))) (defun add-default-attribute (element adef) (let* ((value (second (cxml::attdef-default adef))) @@ -1074,25 +1087,20 @@ (text (dom:create-text-node owner value))) (setf (slot-value anode 'specified-p) nil) (setf (slot-value anode 'owner-element) element) - (multiple-value-bind (prefix local-name) - (handler-case - (cxml::split-qname (cxml::attdef-name adef)) - (cxml:well-formedness-violation (c) - (dom-error :NAMESPACE_ERR "~A" c))) - ;; das ist fuer importnode07. - ;; so richtig ueberzeugend finde ich das ja nicht. - (setf (slot-value anode 'prefix) prefix) - (setf (slot-value anode 'local-name) local-name)) (dom:append-child anode text) - (push anode (slot-value (dom:attributes element) 'items)))) + (push anode (slot-value (dom:attributes element) 'items)) + anode)) -(defmethod dom:remove-named-item :after ((self attribute-node-map) name) - (maybe-add-default-attribute (slot-value self 'element) name)) +(defmethod dom:remove-named-item ((self attribute-node-map) name) + name + (let ((k (call-next-method))) + (maybe-add-default-attribute (slot-value self 'element) k) + k)) -(defmethod dom:remove-named-item-ns - ((self attribute-node-map) uri lname) +(defmethod dom:remove-named-item-ns ((self attribute-node-map) uri lname) + uri lname (let ((k (call-next-method))) - (maybe-add-default-attribute (slot-value self 'element) (dom:node-name k)) + (maybe-add-default-attribute (slot-value self 'element) k) k)) (defmethod dom:get-elements-by-tag-name ((element element) name)

1 0

[cxml-cvs] CVS update: cxml/DOMTEST
by dlichteblau＠common-lisp.net 11 Dec '05

11 Dec '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv12142 Modified Files: DOMTEST Log Message: 782/808 removeAttributeNS02.xml -TEST FAILED: There is no applicable method for the generic function - #<STANDARD-GENERIC-FUNCTION DOM:NAMESPACE-URI (2)> - when called with arguments - (NIL). Date: Sun Dec 11 21:04:06 2005 Author: dlichteblau Index: cxml/DOMTEST diff -u cxml/DOMTEST:1.29 cxml/DOMTEST:1.30 --- cxml/DOMTEST:1.29 Sun Dec 11 20:54:56 2005 +++ cxml/DOMTEST Sun Dec 11 21:04:06 2005 @@ -817,10 +817,6 @@ 780/808 publicId01.xml 781/808 removeAttributeNS01.xml 782/808 removeAttributeNS02.xml -TEST FAILED: There is no applicable method for the generic function - #<STANDARD-GENERIC-FUNCTION DOM:NAMESPACE-URI (2)> - when called with arguments - (NIL). 783/808 removeNamedItemNS01.xml 784/808 removeNamedItemNS02.xml 785/808 removeNamedItemNS03.xml @@ -845,4 +841,4 @@ 803/808 setNamedItemNS04.xml 804/808 setNamedItemNS05.xml 805/808 systemId01.xml -3/763 tests failed; 45 tests were skipped \ No newline at end of file +2/763 tests failed; 45 tests were skipped \ No newline at end of file

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cxml-cvs