Changeset 11279

Timestamp:

04/17/07 21:28:24 (2 years ago)

Author:

mloskot

Message:

Backported fixes and tests for Ticket #755 to stable branch 1.4.

Files:

• branches/1.4/autotest/gcore/data/doctype.xml (added)
• branches/1.4/autotest/gcore/minixml.py (modified) (2 diffs)
• branches/1.4/gdal/port/cpl_minixml.cpp (modified) (2 diffs)

branches/1.4/autotest/gcore/minixml.py

@@ -136 +136 @@
-
-###############################################################################
+# Read XML document with complex DOCTYPE element.
+
+def minixml_3():
+
+    fp = open( 'data/doctype.xml', 'r' )
+    text = fp.read()
+    tree = gdal.ParseXMLString( text )
+
+    if tree[0] != gdal.CXT_Element:
+        gdaltest.post_reason( 'wrong node type.' )
+        return 'fail'
+
+    # Check <chapter> element
+    node = tree[6]
+
+    if node[0] != gdal.CXT_Element:
+        gdaltest.post_reason( 'wrong node type.' )
+        return 'fail'
+
+    if node[1] != 'chapter':
+        gdaltest.post_reason( 'Wrong element name' )
+        return 'fail'
+    
+    if len(node) != 7:
+        gdaltest.post_reason( 'Wrong number of children.' )
+        return 'fail'
+
+    # Check <chapter><title> subelement
+    subnode = node[2]
+
+    if subnode[0] != gdal.CXT_Element:
+        gdaltest.post_reason( 'wrong node type.' )
+        return 'fail'
+
+    if subnode[1] != 'title':
+        gdaltest.post_reason( 'Wrong element name' )
+        return 'fail'
+
+    if len(subnode) != 3:
+        gdaltest.post_reason( 'Wrong number of children.' )
+        return 'fail'
+
+    if subnode[2][1] != 'Chapter 1':
+        gdaltest.post_reason( 'Wrong element content.' )
+        return 'fail'
+
+    # Check fist <chapter><para> subelement
+    subnode = node[3]
+
+    if subnode[0] != gdal.CXT_Element:
+        gdaltest.post_reason( 'wrong node type.' )
+        return 'fail'
+
+    if subnode[1] != 'para':
+        gdaltest.post_reason( 'Wrong element name' )
+        return 'fail'
+
+    if len(subnode) != 3:
+        gdaltest.post_reason( 'Wrong number of children.' )
+        return 'fail'
+
+    return 'success'
+
+###############################################################################
-# Cleanup
-
@@ -144 +208 @@
-    minixml_1,
-    minixml_2,
+    minixml_3,
-    minixml_cleanup ]
-

branches/1.4/gdal/port/cpl_minixml.cpp

@@ -202 +202 @@
-                break;
-            }
+            
+            /* Skip the internal DTD subset as NOT SUPPORTED YET (Ticket #755).
+             * The markup declaration block within a DOCTYPE tag consists of:
+             * - a left square bracket [
+             * - a list of declarations
+             * - a right square bracket ]
+             * Example:
+             * <!DOCTYPE RootElement [ ...declarations... ]>
+             *
+             * We need to skip all 3 parts, until closing > 
+             */
+            if( chNext == '[' )
+            {
+                do
+                {
+                    chNext = ReadChar( psContext );
+                }
+                while( chNext != ']'
+                    && !EQUALN(psContext->pszInput+psContext->nInputOffset,"]>", 2) );
+
+                // Skip "]" character to point to the closing ">"
+                chNext = ReadChar( psContext );
+                chNext = ReadChar( psContext );
+            }
+
-
-            if( chNext == '\"' )
@@ -1730 +1755 @@
- * @param psTree the document tree to write. 
- * @param pszFilename the name of the file to write to. 
+ * @return TRUE on success, FALSE otherwise.
- */
-