Skip to content

Custom CSV Styles #30

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

Merged
merged 3 commits into from
Oct 22, 2015
Merged

Custom CSV Styles #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a9a9e5
Fix workspace path
nilshoerrmann Jun 24, 2015
d502eb5
Make CSV style configurable
nilshoerrmann Jun 24, 2015
c548c18
Merge branch 'master' into integration
nilshoerrmann Jun 24, 2015
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
2 changes: 1 addition & 1 deletion data-sources/datasource.remote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ public function execute(array &$param_pool = null)
if (empty($this->_env)) {
$this->_env['env']['pool'] = array(
'root' => URL,
'workspace' => WORKSPACE
'workspace' => URL . '/workspace'
);
}

Expand Down
14 changes: 14 additions & 0 deletions extension.driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,18 @@ public function addCachingOpportunity($context)

$context['wrapper']->appendChild($label);
}

public function install()
{
Symphony::Configuration()->set('csv-delimiter', ',', 'remote_datasource');
Symphony::Configuration()->set('csv-enclosure', '"', 'remote_datasource');
Symphony::Configuration()->set('csv-escape', '\\', 'remote_datasource');
Symphony::Configuration()->write();
}

public function uninstall()
{
Symphony::Configuration()->remove('remote_datasource');
}

}
4 changes: 4 additions & 0 deletions extension.meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
</author>
</authors>
<releases>
<release version="2.2.0" date="2015-06-24" min="2.4" max="2.6.x">
- Make CSV style configurable.
- Fix `{$workspace}` path
</release>
<release version="2.1.3" date="2015-05-13" min="2.4" max="2.6.x">
- Fix a bug with late static binding on PHP 5.3.
</release>
Expand Down
12 changes: 10 additions & 2 deletions lib/class.csv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ public static function convertToXML($data)
{
$headers = array();

// Get CSV settings
$settings = array(
'csv-delimiter' => ',',
'csv-enclosure' => '"',
'csv-escape' => '\\'
);
$settings = array_merge($settings, (array) Symphony::Configuration()->get('remote_datasource'));

// DOMDocument
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
Expand All @@ -46,14 +54,14 @@ public static function convertToXML($data)
}

if ($i == 0) {
foreach (str_getcsv($row) as $i => $head) {
foreach (str_getcsv($row, $settings['csv-delimiter'], $settings['csv-enclosure'], $settings['csv-escape']) as $i => $head) {
if (class_exists('Lang')) {
$head = Lang::createHandle($head);
}
$headers[] = $head;
}
} else {
self::addRow($doc, $root, str_getcsv($row), $headers);
self::addRow($doc, $root, str_getcsv($row, $settings['csv-delimiter'], $settings['csv-enclosure'], $settings['csv-escape']), $headers);
}
}

Expand Down