[Fmsystem-commits] [15314]

[nelson . guerra]

Revision: 15314
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15314
Author:   nelson224
Date:     2016-06-22 01:25:03 +0000 (Wed, 22 Jun 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uiimport.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.uiimport.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiimport.inc.php       
2016-06-22 01:24:50 UTC (rev 15313)
+++ branches/dev-syncromind-2/property/inc/class.uiimport.inc.php       
2016-06-22 01:25:03 UTC (rev 15314)
@@ -987,6 +987,7 @@
                                        
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'property.uiimport.components'));
                                }
 
+                               $entity_categories_in_xml = array();
                                foreach ($files as $file)
                                {
                                        $valid_type = true;
@@ -1009,17 +1010,35 @@
 
                                        $result = 
$this->getxmldata($file['name'], $get_identificator);
                                        
+                                       $postnrdelkode = 
$result['Prosjekter']['ProsjektNS']['Postnrplan']['PostnrdelKoder']['PostnrdelKode'];
+                                       $entities_name = array();
+                                       foreach ($postnrdelkode as $items) 
+                                       {
+                                               if 
($items['PostnrdelKoder']['PostnrdelKode']['Kode'])
+                                               {
+                                                               
$entities_name[$items['PostnrdelKoder']['PostnrdelKode']['Kode']] = array(
+                                                                       'name' 
=> $items['PostnrdelKoder']['PostnrdelKode']['Kode'].' - 
'.$items['PostnrdelKoder']['PostnrdelKode']['Navn']
+                                                               );              
                                        
+                                               }
+                                               else {
+                                                       foreach 
($items['PostnrdelKoder']['PostnrdelKode'] as $item) 
+                                                       {
+                                                               
$entities_name[$item['Kode']] = array('name' => $item['Kode'].' - 
'.$item['Navn']);
+                                                       }
+                                               }
+                                       }
+                                       
                                        $posts = 
$result['Prosjekter']['ProsjektNS']['Prosjektdata']['Post'];
-                                       
                                        foreach ($posts as $post) 
                                        {
-                                               $entity_categories_in_xml[] = 
array(
-                                                       'buildingpart' => 
$post['Postnrdeler']['Postnrdel'][1]['Kode'],
+                                               $buildingpart = 
$post['Postnrdeler']['Postnrdel'][1]['Kode'];
+                                               
$entity_categories_in_xml[$buildingpart]['name'] = 
$entities_name[$buildingpart]['name'];
+                                               
$entity_categories_in_xml[$buildingpart]['components'][] = array(
                                                        'benevnelse' => 
trim($post['Egenskaper']['Egenskap']['Verdi']),
                                                        'beskrivelse' => 
trim($post['Tekst']['Uformatert'])
                                                );
                                                
-                                               
$buildingpart_in_xml[$post['Postnrdeler']['Postnrdel'][1]['Kode']] = 
$post['Postnrdeler']['Postnrdel'][1]['Kode'];
+                                               
//$buildingpart_in_xml[$post['Postnrdeler']['Postnrdel'][1]['Kode']] = 
$post['Postnrdeler']['Postnrdel'][1]['Kode'];
                                        }
                
                                        //echo '<li class="info">Import: 
finished step ' . print_r($buildingpart) . '</li>';
@@ -1031,22 +1050,44 @@
                                $entity_categories  = 
$import_components->get_entity_categories();
 
                                $buildingpart_out_table = array();
-                               foreach ($buildingpart_in_xml as $item) 
+                               foreach ($entity_categories_in_xml as $k => $v) 
                                {
-                                       if (!array_key_exists((string)$item, 
$entity_categories))
+                                       if (!array_key_exists((string)$k, 
$entity_categories))
                                        {
-                                               $buildingpart_parent = 
substr($item, 0, strlen($item) -1);
-                                               $buildingpart_out_table[$item] 
= array('parent' => $entity_categories[$buildingpart_parent]);
+                                               $buildingpart_parent = 
substr($k, 0, strlen($k) -1);
+                                               $buildingpart_out_table[$k] = 
array('parent' => $entity_categories[$buildingpart_parent], 'name' => 
$v['name']);
+                                       } else {
+                                               
$entity_categories_in_xml[$k]['cat_id'] = $entity_categories[$k]['id'];
+                                               
$entity_categories_in_xml[$k]['entity_id'] = 
$entity_categories[$k]['entity_id'];
                                        }
                                }
                                
-                               if (count($buildingpart_out_table))
+                               /*if (count($buildingpart_out_table))
                                {
-                                       //$buildingpart_processed = 
$import_components->add_entity_categories($buildingpart_out_table);
-                               }
+                                       $buildingpart_processed = 
$import_components->add_entity_categories($buildingpart_out_table);
+                                       
+                                       if 
(count($buildingpart_processed['added']))
+                                       {
+                                               
foreach($buildingpart_processed['added'] as $k => $v)
+                                               {
+                                                       
$entity_categories_in_xml[$k]['cat_id'] = $v['id'];
+                                                       
$entity_categories_in_xml[$k]['entity_id'] = $v['entity_id'];                   
                                
+                                               }
+                                       } 
+                                       
+                                       if 
(count($buildingpart_processed['not_added']))
+                                       {
+                                               
foreach($buildingpart_processed['not_added'] as $k => $v)
+                                               {
+                                                       
unset($entity_categories_in_xml[$k]);                                   
+                                               }                               
                
+                                       }
+                               }*/
                                
-                               print_r($buildingpart_in_xml);
+                               //$processed = 
$import_components->add_bim_item($entity_categories_in_xml);
                                
+                               print_r($entity_categories_in_xml);
+                               
                                echo "</ul>";
                                $end_time = time();
                                $difference = ($end_time - $start_time) / 60;