backport: Fix for multiline CDATA parsing in XML import

diff --git a/HISTORY b/HISTORY
index fb9e81aafeda6c794034b1b3124a46d991982e08..802b837e1cca6924a731dc3d68da95d91d12dd82 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -10,6 +10,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
 
 Translations
 * Japanese from Tadashi

diff --git a/dataimport.php b/dataimport.php
index b9243f466e9b122905114c8d78806352aab6e836..326ca943b7849ea793f591c68ee2529344cfd554 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.2.2.1 2004/07/01 06:42:59 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;
                } 
        }