[Fmsystem-commits] [8262] bim converter

[Sigurd Nes]

Revision: 8262
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8262
Author:   sigurdne
Date:     2011-12-09 14:18:52 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
bim converter

Modified Paths:
--------------
    trunk/bim/setup/setup.inc.php
    trunk/bim/setup/tables_current.inc.php
    trunk/bim/setup/tables_update.inc.php
    trunk/property/inc/class.soadmin_entity.inc.php

Modified: trunk/bim/setup/setup.inc.php
===================================================================
--- trunk/bim/setup/setup.inc.php       2011-12-09 12:45:36 UTC (rev 8261)
+++ trunk/bim/setup/setup.inc.php       2011-12-09 14:18:52 UTC (rev 8262)
@@ -12,7 +12,7 @@
        */
 
        $setup_info['bim']['name']                      = 'bim';
-       $setup_info['bim']['version']           = '0.9.17.503';
+       $setup_info['bim']['version']           = '0.9.17.504';
        $setup_info['bim']['app_order']         = 8;
        $setup_info['bim']['enable']            = 1;
        $setup_info['bim']['app_group']         = 'office';

Modified: trunk/bim/setup/tables_current.inc.php
===================================================================
--- trunk/bim/setup/tables_current.inc.php      2011-12-09 12:45:36 UTC (rev 
8261)
+++ trunk/bim/setup/tables_current.inc.php      2011-12-09 14:18:52 UTC (rev 
8262)
@@ -17,7 +17,7 @@
                                'id' => array('type' => 'auto', 'precision' => 
4, 'nullable' => False),
                                'location_id' => array('type' => 
'int','precision' => 4,'nullable' => True),
                                'is_ifc' => array('type' => 'int','precision' 
=> 2,'default' => 1,'nullable' => True),
-                               'name' => array('type' => 'varchar', 
'precision' => 64,'nullable' => False),
+                               'name' => array('type' => 'varchar', 
'precision' => 150,'nullable' => False),
                                'description' => array('type' => 'varchar', 
'precision' => 512,'nullable' => True)
                        ),
                        'pk' => array('id'),

Modified: trunk/bim/setup/tables_update.inc.php
===================================================================
--- trunk/bim/setup/tables_update.inc.php       2011-12-09 12:45:36 UTC (rev 
8261)
+++ trunk/bim/setup/tables_update.inc.php       2011-12-09 14:18:52 UTC (rev 
8262)
@@ -67,5 +67,18 @@
                }
        }
        
-       
-       
+       /**
+       * Update bim version from 0.9.17.503 to 0.9.17.504
+       */
+       $test[] = '0.9.17.503';
+       function bim_upgrade0_9_17_503()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_bim_type','name',array('type' 
=> 'varchar','precision' => '150','nullable' => False));
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['bim']['currentver'] = 
'0.9.17.504';
+                       return $GLOBALS['setup_info']['bim']['currentver'];
+               }
+       }

Modified: trunk/property/inc/class.soadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.soadmin_entity.inc.php     2011-12-09 12:45:36 UTC 
(rev 8261)
+++ trunk/property/inc/class.soadmin_entity.inc.php     2011-12-09 14:18:52 UTC 
(rev 8262)
@@ -1097,7 +1097,8 @@
                                                        $data = 
$this->db->Record;
 
                                                        $xmldata = 
phpgwapi_xmlhelper::toXML($data, 
"_{$this->type}_{$category['entity_id']}_{$category['id']}");
-                                                       $doc = new DOMDocument;
+                                                       $doc = new 
DOMDocument('1.0', 'utf-8');
+                                                       $doc->loadXML($xmldata);
                                                        $domElement = 
$doc->getElementsByTagName("_{$this->type}_{$category['entity_id']}_{$category['id']}")->item(0);
                                                        $domAttribute = 
$doc->createAttribute('appname');
                                                        $domAttribute->value = 
'property';
@@ -1109,7 +1110,6 @@
                                                        
$doc->appendChild($domElement);
 
                                                        
$doc->preserveWhiteSpace = true;
-                                                       $doc->loadXML( $xmldata 
);
                                                        $doc->formatOutput = 
true;
                                                        $xml = $doc->saveXML();