Fix for multiline CDATA parsing in XML import

diff --git a/HISTORY b/HISTORY
index b879ded9232b9d49107ea2a8d46645dae60aeaa7..3eb8a4bcc598653b625608de25a3ad8546f5060e 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -22,6 +22,7 @@ Bugs
 * Fix join clause created by view wizard for pre 7.3
 * Fix reindex of mixed case indexes
 * Show domains in type lists in appropriate places
+* Fix for multiline CDATA parsing in XML import
 
 Version 3.4
 -----------

diff --git a/dataimport.php b/dataimport.php
index b9243f466e9b122905114c8d78806352aab6e836..09741ec4b24ea42624a75c4a47e5e774db286a99 100644 (file)
--- a/dataimport.php
+++ b/dataimport.php
@@ -3,7 +3,7 @@
        /**
         * Does an import to a particular table from a text file
         *
-        * $Id: dataimport.php,v 1.2 2004/04/12 07:50:33 chriskl Exp $
+        * $Id: dataimport.php,v 1.3 2004/07/01 06:41:42 chriskl Exp $
         */
 
        // Include application functions
@@ -144,7 +144,7 @@
                global $state, $curr_col_val;
 
                if ($state == 'COLUMN') {
-                       $curr_col_val = $cdata;
+                       $curr_col_val .= $cdata;
                } 
        }