Changeset 2038

Timestamp:

07/28/10 11:42:50 (6 weeks ago)

Author:

x.pechoultres@…

Message:

Dom3 :

+ Document::minimize? option to reduce generated xml files
+ escape attribute string with (see XML Spec / 2.3)

Location:

trunk/modules/Dom3/source

Files:

• print.cl (modified) (3 diffs)
• read.cl (modified) (1 diff)
• xmlcore.cl (modified) (1 diff)

trunk/modules/Dom3/source/print.cl

@@ -21 +21 @@
 // just prints spaces according to the indentation level
 [indent(n:Node) : string
--> let res := "\n"
-   in (for i in (2 .. indentlevel(n) - 1) res :/+ "\t", res)]
+-> if (n.ownerDocument.minimize?) "" else
+        let res := "\n"
+        in (for i in (2 .. indentlevel(n) - 1) res :/+ "\t", res)]
 
 // @chapter 4
@@ -28 +29 @@
 [print(a:Attr) : void
 -> if (known?(value,a) & known?(name,a))
-        printf(" ~A=\"~A\"",a.name,a.value)]
+        printf(" ~A=\"~A\"",a.name,strescape(a.value))]
 // @chapter 4
 // prints an attribute (attrName="attrValue")
 [print(a:Attr,indent?:boolean) : void
--> if (known?(value,a) & known?(name,a))
-        printf("~A~A=\"~A\"",(if indent? indent(a) else " "),a.name,a.value)]
+-> if (a.ownerDocument.minimize?) indent? := false,
+        if (known?(value,a) & known?(name,a))
+        printf("~A~A=\"~A\"",(if indent? indent(a) else " "),a.name,strescape(a.value))]
 
 
@@ -126 +128 @@
                         else if(strncmp(src,\"#39;\",4) == 0) {*travel++ = '\\''; src += 4;}
                         else if(strncmp(src,\"amp;\",4) == 0) {*travel++ = '&'; src += 4;}
+                        else if(strncmp(src,\"apos;\",5) == 0) {*travel++ = '\\''; src += 5;}
                         else if(strncmp(src,\"quot;\",5) == 0) {*travel++ = '\"'; src += 5;}
                         else {*travel++ = '&'; *travel++ = *src++; }

trunk/modules/Dom3/source/read.cl

@@ -11 +11 @@
                 let key := _graph[2 * i - 1],
                         _value := _graph[2 * i] in
-                (if known?(key) setAttribute(n,key,_value)),
+                (if known?(key) setAttribute(n,key,strunescape(_value))),
                 //[3] << domStartHandler,
         n)]

trunk/modules/Dom3/source/xmlcore.cl

@@ -91 +91 @@
                 implementation:DOMImplementation = DOMImplementation(),
                 documentElement:Element,
+                minimize?:boolean = false,
                 mime:string = "application/xml",
                 interfaceEncoding:string = "UTF-8", // encoding used when getting string