[Fmsystem-commits] [15984]

[nelson . guerra]

Revision: 15984
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15984
Author:   nelson224
Date:     2016-11-10 02:30:02 +0000 (Thu, 10 Nov 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-11-10 02:21:22 UTC (rev 15983)
+++ 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
  2016-11-10 02:30:02 UTC (rev 15984)
@@ -388,6 +388,8 @@
                        
                        $patrones = array('(\\/)', '(\\\\)', '(")');
                        $sustituciones = array('_', '_', '_');
+                       $patrones_2 = array('(\\/)', '(")');
+                       $sustituciones_2 = array('_', '_');
                        foreach ($exceldata as $k => $row) 
                        {
                                if (!$this->_valid_row($row))
@@ -395,6 +397,7 @@
                                        continue;
                                }
                                
+                               $path = $row[(count($row)-2)];
                                $path_file = $row[(count($row)-1)];
                                $array_path = explode("\\", $path_file);
                                                
@@ -402,6 +405,7 @@
                                        'name' => $row[1],
                                        'desription' => $row[2],
                                        'file' => 
$array_path[count($array_path)-1],
+                                       'path' => preg_replace($patrones_2, 
$sustituciones_2, $path),
                                        'path_file_string' => 
preg_replace($patrones, $sustituciones, $path_file),
                                        'row' => ($k + 1)
                                );
@@ -581,6 +585,7 @@
                                $metadata['report_date'] = 
phpgwapi_datetime::date_to_timestamp(date('Y-m-d'));
                                $metadata['title'] = $file_data['name']; 
                                $metadata['descr'] = $file_data['desription'];
+                               $metadata['path'] = $file_data['path'];
                                
                                $values_insert = array
                                        (