[Phpgroupware-cvs] property/inc class.XmlToArray.inc.php import/Im...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/01/28 19:13:19

Modified files:
        inc            : class.XmlToArray.inc.php 
        inc/import     : Import_fra_Kemner_xml 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.XmlToArray.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_Kemner_xml?cvsroot=phpgroupware&r1=1.11&r2=1.12

Patches:
Index: class.XmlToArray.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.XmlToArray.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.XmlToArray.inc.php    26 Jan 2007 14:53:47 -0000      1.4
+++ class.XmlToArray.inc.php    28 Jan 2007 19:13:19 -0000      1.5
@@ -24,7 +24,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage xml
-       * @version $Id: class.XmlToArray.inc.php,v 1.4 2007/01/26 14:53:47 
sigurdne Exp $
+       * @version $Id: class.XmlToArray.inc.php,v 1.5 2007/01/28 19:13:19 
sigurdne Exp $
        * @internal This class originated from: address@hidden AT: 
http://www.devdump.com/phpxml.php
        */
 
@@ -523,7 +523,7 @@
                function _getChildren( $vals, &$i )
                {
                        $children = array(); // Contains node data
-                       if (isset($vals[$i]['value']))
+                       if (isset($vals[$i]['tag']))
                        {
                                if( trim($vals[$i]['value']) != '' )
                                {

Index: import/Import_fra_Kemner_xml
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_Kemner_xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- import/Import_fra_Kemner_xml        26 Jan 2007 14:58:56 -0000      1.11
+++ import/Import_fra_Kemner_xml        28 Jan 2007 19:13:19 -0000      1.12
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage import
-       * @version $Id: Import_fra_Kemner_xml,v 1.11 2007/01/26 14:58:56 
sigurdne Exp $
+       * @version $Id: Import_fra_Kemner_xml,v 1.12 2007/01/28 19:13:19 
sigurdne Exp $
        */
 
        /**
@@ -83,6 +83,7 @@
                        $var_result = $this->xmltool->export_var();
 */
                        $xmlparse = CreateObject('property.XmlToArray');
+                       $xmlparse->setEncoding('ISO-8859-1');
                        $var_result = $xmlparse->parseFile($tsvfile);
 
                        set_time_limit(300);