diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index 4d0634265176..3c0ed45bdb05 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -163,10 +163,19 @@ class ImportController extends Controller $bestDelimiter = ' '; $count = 0; 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); $bestDelimiter = $delimiter; } + + + } return $bestDelimiter; } diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php index 78e3a6ad2c0f..e3a29e030add 100644 --- a/app/Import/Providers/BaseImport.php +++ b/app/Import/Providers/BaseImport.php @@ -123,14 +123,20 @@ class BaseImport public function detectDelimiter($csvfile) { - $delimiters = [',', '.', ';']; - $bestDelimiter = ' '; + $delimiters = [',', '.', ';', '|']; + $bestDelimiter = ','; $count = 0; 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); $bestDelimiter = $delimiter; } + + } return $bestDelimiter; }