[Fmsystem-commits] [15691]

[nelson . guerra]

Revision: 15691
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15691
Author:   nelson224
Date:     2016-09-17 01:18:46 +0000 (Sat, 17 Sep 2016)
Log Message:
-----------


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

Modified: 
branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php    
2016-09-17 01:18:34 UTC (rev 15690)
+++ branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php    
2016-09-17 01:18:46 UTC (rev 15691)
@@ -68,7 +68,13 @@
 
                public function download()
                {
-                       return;
+                       $components =  
unserialize($GLOBALS['phpgw_info']['server']['component_import_preview_components']);
+                       
+                       $fields = array_keys($components[0]);
+
+                       $bocommon = CreateObject('property.bocommon');
+                       $bocommon->download($components, $fields, $fields);
+                       $GLOBALS['phpgw']->common->phpgw_exit();
                }
 
                private function valid_row($row)
@@ -557,42 +563,18 @@
                                                }
                                        }
                                }
-
-                       
-                               if (count($buildingpart_in_table))
-                               {
-                                       $receipt = 
$import_entity_categories->add_attributes_to_categories($buildingpart_in_table);
-                                       if ($receipt['error'])
-                                       {
-                                               return $receipt;
-                                       }
-                               }
                                
                                if (count($buildingpart_out_table))
                                {
                                        ksort($buildingpart_out_table);
-                                       $buildingpart_processed = 
$import_entity_categories->add_entity_categories($buildingpart_out_table);
-
-                                       if 
(count($buildingpart_processed['not_added']))
+                                       $receipt = 
$import_entity_categories->prepare_entity_categories($buildingpart_out_table);
+                                       if ($receipt['error'])
                                        {
-                                               
foreach($buildingpart_processed['not_added'] as $k => $v)
-                                               {
-                                                       $receipt['error'][] = 
array('msg' => "parent {$k} not added");  
-                                               }
                                                return $receipt;
                                        }
-
-                                       if 
(count($buildingpart_processed['added']))
-                                       {
-                                               
foreach($buildingpart_processed['added'] as $k => $v)
-                                               {
-                                                       
$import_data[$k]['cat_id'] = $v['id'];
-                                                       
$import_data[$k]['entity_id'] = $v['entity_id'];                        
-                                               }
-                                       } 
                                }
 
-                               $receipt = 
$import_components->add_bim_item($import_data, $location_code);
+                               
$import_components->prepare_preview_components($import_data);
                        
                                return $receipt;
                        }