Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#4174: Allow to activate trailing delimiter for CSV parser #4175

Open
wants to merge 2 commits into
base: 2.x
Choose a base branch
from
Open

#4174: Allow to activate trailing delimiter for CSV parser #4175

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3123b73
#4174: Allow to activate trailing delimiter for CSV parser
stefan-korn May 2, 2024
7af75bf
#4174: Allow to activate trailing delimiter for CSV parser
stefan-korn May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/datastore/src/Service/ImportService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,15 @@ private function getNonRecordingParser(string $delimiter) : Csv {
'quote' => '"',
'escape' => "\\",
'record_end' => ["\n", "\r"],
'trailing_delimiter' => FALSE,
];

$parserConfiguration = $this->dispatchEvent(self::EVENT_CONFIGURE_PARSER, $parserConfiguration);

$parser = Csv::getParser($parserConfiguration['delimiter'], $parserConfiguration['quote'], $parserConfiguration['escape'], $parserConfiguration['record_end']);
if (!empty($parserConfiguration['trailing_delimiter'])) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might it not be a little cleaner to expect this to be a bool and therefore have a tighter conditional for it?

Suggested change
if (!empty($parserConfiguration['trailing_delimiter'])) {
if ($parserConfiguration['trailing_delimiter'] === TRUE) {

$parser->activateTrailingDelimiter();
}
$parser->machine->stopRecording();
return $parser;
}
Expand Down