[Fmsystem-commits] [15740]

[nelson . guerra]

Revision: 15740
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15740
Author:   nelson224
Date:     2016-09-28 00:11:37 +0000 (Wed, 28 Sep 2016)
Log Message:
-----------


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

Modified: 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
===================================================================
--- 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
  2016-09-27 02:02:40 UTC (rev 15739)
+++ 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
  2016-09-28 00:11:37 UTC (rev 15740)
@@ -6,7 +6,6 @@
                {
                        $this->acl = & $GLOBALS['phpgw']->acl;
                        $this->db = & $GLOBALS['phpgw']->db;
-                       //$this->vfs = CreateObject('phpgwapi.vfs');
                        
                        $this->fakebase = '/temp_files_components';
                        $this->path_upload_dir = 
$GLOBALS['phpgw_info']['server']['files_dir'].$this->fakebase.'/';
@@ -62,7 +61,7 @@
                        return true;
                }
                
-               public function add_files($id, $location_code, $component_id)
+               public function add_files($id, $location_code, 
$attrib_name_componentID)
                {               
                        $exceldata = 
$this->_getexceldata($_FILES['file']['tmp_name'], true);
                        $component_files = array();
@@ -98,7 +97,7 @@
                                                $component = array('id' => $id, 
'location_id' => $GLOBALS['phpgw']->locations->get_id('property', 
'.location.'.count(explode('-', $location_code))));
                                        }
                                        else {
-                                               $component = 
$this->_get_component($k, $component_id);
+                                               $component = 
$this->_get_component($k, $attrib_name_componentID);
                                                if( empty($component['id']) || 
empty($component['location_id']))
                                                {
                                                        throw new 
Exception("component {$k} does not exist");
@@ -147,14 +146,14 @@
                }
                
                
-               private function _get_component( $query, $component_id)
+               private function _get_component( $query, 
$attrib_name_componentID)
                {
                        if ($query)
                        {
                                $query = $this->db->db_addslashes($query);
                        }
 
-                       $sql = "SELECT * FROM fm_bim_item WHERE 
json_representation->>'{$component_id}' = '{$query}'";
+                       $sql = "SELECT * FROM fm_bim_item WHERE 
json_representation->>'{$attrib_name_componentID}' = '{$query}'";
 
                        $this->db->query($sql, __LINE__, __FILE__);