lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show separator char used in CSV module

Browse Source
This commit is contained in:
Laurent Destailleur 2009-09-27 21:28:52 +00:00
parent 8db2df6901
commit 25161d3fc4
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/includes/modules/export/export_csv.modules.php
View File

@ -56,8 +56,13 @@ class ExportCsv extends ModeleExports
global $conf; global $conf;
$this->db = $db; $this->db = $db;
$this->separator=',';
if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
$this->escape="\\";
$this->string='"';
$this->id='csv'; // Same value then xxx in file name export_xxx.modules.php $this->id='csv'; // Same value then xxx in file name export_xxx.modules.php
$this->label='Csv (Comma Separated Value)'; // Label of driver $this->label='Csv (Comma Separated Value, separator="'.$this->separator.'")'; // Label of driver
$this->extension='csv'; // Extension for generated file by this driver $this->extension='csv'; // Extension for generated file by this driver
$this->picto='mime/other'; // Picto $this->picto='mime/other'; // Picto
$ver=split(' ','$Revision$'); $ver=split(' ','$Revision$');
@ -67,8 +72,6 @@ class ExportCsv extends ModeleExports
$this->label_lib='Dolibarr'; $this->label_lib='Dolibarr';
$this->version_lib=DOL_VERSION; $this->version_lib=DOL_VERSION;
$this->separator=',';
if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
} }
function getDriverId() function getDriverId()

10
htdocs/includes/modules/import/import_csv.modules.php
View File

@ -56,8 +56,13 @@ class ImportCsv extends ModeleImports
global $conf; global $conf;
$this->db = $db; $this->db = $db;
$this->separator=',';
if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
$this->escape="\\";
$this->string='"';
$this->id='csv'; // Same value then xxx in file name export_xxx.modules.php $this->id='csv'; // Same value then xxx in file name export_xxx.modules.php
$this->label='Csv (Comma Separated Value)'; // Label of driver $this->label='Csv (Comma Separated Value, separator="'.$this->separator.'")'; // Label of driver
$this->extension='csv'; // Extension for generated file by this driver $this->extension='csv'; // Extension for generated file by this driver
$this->picto='mime/other'; // Picto $this->picto='mime/other'; // Picto
$ver=split(' ','$Revision$'); $ver=split(' ','$Revision$');
@ -66,9 +71,6 @@ class ImportCsv extends ModeleImports
// If driver use an external library, put its name here // If driver use an external library, put its name here
$this->label_lib='Dolibarr'; $this->label_lib='Dolibarr';
$this->version_lib=DOL_VERSION; $this->version_lib=DOL_VERSION;
$this->separator=',';
if (! empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->IMPORT_CSV_SEPARATOR_TO_USE;
} }
function getDriverId() function getDriverId()