Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 07:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for delimiter search

Browse Source
This commit is contained in:
David Bomba 2023-03-04 11:53:09 +11:00
parent 26a4198cbe
commit d9e6d5149b
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/ImportController.php
View File

@ -163,10 +163,19 @@ class ImportController extends Controller
$bestDelimiter = ' '; $bestDelimiter = ' ';
$count = 0; $count = 0;
foreach ($delimiters as $delimiter) { foreach ($delimiters as $delimiter) {
if (substr_count($csvfile, $delimiter) > $count) {
// if (substr_count($csvfile, $delimiter) > $count) {
// $count = substr_count($csvfile, $delimiter);
// $bestDelimiter = $delimiter;
// }
if (substr_count(strstr($csvfile,"\n",true), $delimiter) > $count) {
$count = substr_count($csvfile, $delimiter); $count = substr_count($csvfile, $delimiter);
$bestDelimiter = $delimiter; $bestDelimiter = $delimiter;
} }
} }
return $bestDelimiter; return $bestDelimiter;
} }

12
app/Import/Providers/BaseImport.php
View File

@ -123,14 +123,20 @@ class BaseImport
public function detectDelimiter($csvfile) public function detectDelimiter($csvfile)
{ {
$delimiters = [',', '.', ';']; $delimiters = [',', '.', ';', '|'];
$bestDelimiter = ' '; $bestDelimiter = ',';
$count = 0; $count = 0;
foreach ($delimiters as $delimiter) { foreach ($delimiters as $delimiter) {
if (substr_count($csvfile, $delimiter) > $count) { // if (substr_count($csvfile, $delimiter) > $count) {
// $count = substr_count($csvfile, $delimiter);
// $bestDelimiter = $delimiter;
// }
if (substr_count(strstr($csvfile,"\n",true), $delimiter) > $count) {
$count = substr_count($csvfile, $delimiter); $count = substr_count($csvfile, $delimiter);
$bestDelimiter = $delimiter; $bestDelimiter = $delimiter;
} }
} }
return $bestDelimiter; return $bestDelimiter;
} }