Changeset 2025

Timestamp:

04/15/10 16:33:38 (5 months ago)

Author:

x.pechoultres@…

Message:

Dom3: improve encoding support

Location:

trunk/modules/Dom3/source

Files:

• read.cl (modified) (2 diffs)
• xmlcore.cl (modified) (7 diffs)

trunk/modules/Dom3/source/read.cl

@@ -49 +49 @@
         if (attrs["version"] != "") _x.xmlVersion := attrs["version"],
         if (attrs["encoding"] != "") (
-                _x.inputEncoding := attrs["encoding"],
                 _x.xmlEncoding := attrs["encoding"]),
         _x]
@@ -80 +79 @@
                 Sax/sax(parser),
                 d)]
-/*
-[file2document!(pathFile:string) : Document
--> let d := Document()
-                p := fopen(pathFile,"r")
-   in (Sax/sax(p,domStartHandler,domEndHandler,d), d)]
 
-
-// @chapter 2
-// construct a node base XML tree given a raw of string
-[makeXMLNode(rawtext:string) : XMLNode
--> let d := XMLNode(),
-                p := port!(rawtext)
-   in (Sax/sax(p,domStartHandler,domEndHandler,d),
-                d.children[1])]
-/*              parseXMLStr(rawtext),  */
-//              d)]
-/*
-// @chapter 2
-// nodes count in a XML tree
-[count(n:(XMLNode U XMLDoc)) : integer 
--> let i := 1 
-   in (for sn in n.children (i :+ count(sn)),i)]
-
-
-
-// @chapter 2
-// access to named sub node 
-[subNodeOfName(self:XMLNode,nodeName:string) : (XMLNode U {unknown})
--> some(i in self.children | insensitive=(i.tagname,nodeName))]
-
-// @chapter 2
-// access to named sub nodes 
-[subNodesOfName(self:Dom/XMLNode,nodeName:string) : set[Dom/XMLNode]
--> {i in self.children | insensitive=(i.tagname,nodeName)}]
-
-// @chapter 2
-// add named sub nodes 
-[addSubNodeWithName(self:Dom/XMLNode,keyname:string) : Dom/XMLNode
-->      let node := Dom/XMLNode(tagname = upper(keyname)) in (self.children :add node, node)]
-*/
+[file(s:string) : Document
+-> let f := fopen(s,"r"), res := document!(f) in (fclose(f),res)]

trunk/modules/Dom3/source/xmlcore.cl

@@ -80 +80 @@
                         prefix:string,
                         localName:string,
-                        inputEncoding:string = "UTF-8", // An attribute specifying the encoding used for this document at the time of the parsing
-                        interfaceEncoding:string = "UTF-8", // encoding used when getting string
-                        xmlEncoding:string = "UTF-8", // An attribute specifying, as part of the XML declaration, the encoding of this document
                         xmlStandalone:boolean = false, // An attribute specifying, as part of the XML declaration, whether this document is standalone. This is false when unspecified
                         xmlVersion:string = "1.0" // An attribute specifying, as part of the XML declaration, the version number of this document.
@@ -93 +90 @@
                 doctype:DocumentType,
                 implementation:DOMImplementation = DOMImplementation(),
-                documentElement:Element)
+                documentElement:Element,
+                mime:string = "application/xml",
+                interfaceEncoding:string = "UTF-8", // encoding used when getting string
+                xmlEncoding:string = "UTF-8") // An attribute specifying, as part of the XML declaration, the encoding of this document
 
 DocumentFragment <: Node()
@@ -104 +104 @@
 
 [createElement(doc:Document,tagname:string) : Element -> Element(ownerDocument = doc, tagName = tagname)]
+
+[createElement(elem:Element,tagname:string) : Element ->
+        let e := Element(ownerDocument = elem.ownerDocument,
+                        tagName = tagname)
+        in (appendChild(elem,e),
+                e)]
+
 [createDocumentFragment(doc:Document) : DocumentFragment -> DocumentFragment()]
 [createTextNode(doc:Document,_data:string) : Text -> Text(data = _data, ownerDocument = doc)]
@@ -178 +185 @@
         newChild]
 
+[appendChild(node:Node,newChilds:list[Node]) : Node ->
+        //[3] appendChild(~S,~S) // node, newChilds,
+        for n in newChilds appendChild(node,n),
+        if (length(newChilds) > 0) last(newChilds)
+        else node]
+
+
 
 [hasChildNodes(node:Node) : boolean -> length(node.childNodes) > 0]
@@ -194 +208 @@
 [nth(self:Node,key:string) : string
 ->      when attrib := some( a in self.attributes | (a.name = key)) in 
-                (if (attrib.ownerDocument.inputEncoding != attrib.ownerDocument.interfaceEncoding)
-                        Iconv/iconv(attrib.value,attrib.ownerDocument.interfaceEncoding,attrib.ownerDocument.inputEncoding)
+                (if (attrib.ownerDocument.xmlEncoding != attrib.ownerDocument.interfaceEncoding)
+                        Iconv/iconv(attrib.value,attrib.ownerDocument.interfaceEncoding,attrib.ownerDocument.xmlEncoding)
                 else attrib.value ) else ""]
 
@@ -201 +215 @@
 // setting XML Node attribute
 [nth=(self:Node,key:string,val:string) : void
-->      if (self.ownerDocument.inputEncoding != self.ownerDocument.interfaceEncoding)
-                val := Iconv/iconv(val,self.ownerDocument.inputEncoding,self.ownerDocument.interfaceEncoding),
+->      if (self.ownerDocument.xmlEncoding != self.ownerDocument.interfaceEncoding)
+                val := Iconv/iconv(val,self.ownerDocument.xmlEncoding,self.ownerDocument.interfaceEncoding),
         when attrib := some( a in self.attributes | (a.name = key)) in (
                 attrib.value := val )
         else self.attributes :add Attr(parentNode = self, ownerDocument = self.ownerDocument, name = key, value = val)]
 
+[nth=(self:Node,key:string,val:integer) : void -> nth=(self,key,string!(val))]
+[nth=(self:Node,key:string,val:float) : void -> nth=(self,key,string!(val))]
 
 
@@ -235 +251 @@
 Element <: Node(tagName:string)
 
-[getAttribute(elem:Element,attrname:string) : string -> elem[attrname]]
-
-[setAttribute(elem:Element,attrname:string,val:string) : void -> elem[attrname] := val]
+[getAttribute(elem:Element,attrname:string) : string ->
+        if (elem.ownerDocument.interfaceEncoding != elem.ownerDocument.xmlEncoding)
+                Iconv/iconv(elem[attrname],elem.ownerDocument.interfaceEncoding,elem.ownerDocument.xmlEncoding)
+        else elem[attrname]]
+
+[setAttribute(elem:Element,attrname:string,val:string) : void ->
+        if (elem.ownerDocument.interfaceEncoding != elem.ownerDocument.xmlEncoding)
+                elem[attrname] := Iconv/iconv(val,elem.ownerDocument.xmlEncoding,elem.ownerDocument.interfaceEncoding)
+        else elem[attrname] := val]
+
 [removeAttribute(elem:Element,attrname:string) : void -> when attrib := some( a in elem.attributes | (a.name = attrname)) in delete(elem.attributes,attrib)]