From 8c7ebf09d6217530366bead6f1fd7766b7d6827e Mon Sep 17 00:00:00 2001
From: johnbburg <johnbburg@1867900.no-reply.drupal.org>
Date: Wed, 21 Dec 2016 10:49:54 +0100
Subject: [PATCH] Issue #2834026 by bburg, MegaChriz: Fixed do not add blank
column headers in CSV template.
---
plugins/FeedsCSVParser.inc | 9 ++++--
tests/feeds_parser_csv.test | 59 +++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/plugins/FeedsCSVParser.inc b/plugins/FeedsCSVParser.inc
index 073a56d0..460eb884 100644
--- a/plugins/FeedsCSVParser.inc
+++ b/plugins/FeedsCSVParser.inc
@@ -145,10 +145,10 @@ class FeedsCSVParser extends FeedsParser {
if (strpos($mapping['source'], ',') !== FALSE) {
$sources[] = '"' . $mapping['source'] . '"';
}
- else {
+ elseif (strlen(trim($mapping['source']))) {
$sources[] = $mapping['source'];
}
- if (!empty($mapping['unique'])) {
+ if (!empty($mapping['unique']) && strlen(trim($mapping['source']))) {
$uniques[] = $mapping['source'];
}
}
@@ -293,7 +293,10 @@ class FeedsCSVParser extends FeedsParser {
$col = '"' . str_replace('"', '""', $col) . '"';
}
- $columns[] = $col;
+ // Prevent columns without headers from being added to the template.
+ if (strlen(trim($col))) {
+ $columns[] = $col;
+ }
}
$template_file_details = $this->getTemplateFileDetails($this->config);
diff --git a/tests/feeds_parser_csv.test b/tests/feeds_parser_csv.test
index 5e8826f4..2138f515 100644
--- a/tests/feeds_parser_csv.test
+++ b/tests/feeds_parser_csv.test
@@ -124,6 +124,18 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
// Get CSV template and assert result.
$this->drupalGet('import/' . $key . '/template');
$this->assertRaw($testdata['expected']);
+
+ // Check texts that are displayed on the import page. These texts in the
+ // content should have gone through to check_plain() so we do that here as
+ // well.
+ $this->drupalGet('import/' . $key);
+ $this->assertText('Import CSV files with one or more of these columns: ' . check_plain($testdata['texts']['columns']) . '.');
+ if (isset($testdata['texts']['unique'])) {
+ $this->assertText(check_plain($testdata['texts']['unique']));
+ }
+ else {
+ $this->assertText(t('No columns are unique. The import will only create new items, no items will be updated.'));
+ }
}
}
@@ -151,6 +163,9 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
),
),
'expected' => 'title+;|,"alpha, beta + gamma",guid',
+ 'texts' => array(
+ 'columns' => 'title+;|, "alpha, beta + gamma", guid',
+ ),
),
// Delimiter ';' test. Source keys containing a ';' should be wrapped in
@@ -172,6 +187,9 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
),
),
'expected' => '"title;)";alpha, beta + gamma;guid',
+ 'texts' => array(
+ 'columns' => 'title;), "alpha, beta + gamma", guid',
+ ),
),
// Delimiter 'TAB' test.
@@ -192,6 +210,9 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
),
),
'expected' => 'title,;| alpha, beta + gamma guid',
+ 'texts' => array(
+ 'columns' => '"title,;|", "alpha, beta + gamma", guid',
+ ),
),
// Delimiter '|' test. Source keys containing a '|' should be wrapped in
@@ -213,6 +234,9 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
),
),
'expected' => 'title+;,|"alpha|beta|gamma"|guid',
+ 'texts' => array(
+ 'columns' => '"title+;,", alpha|beta|gamma, guid',
+ ),
),
// Delimiter '+' test. Source keys containing a '+' should be wrapped in
@@ -234,6 +258,9 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
),
),
'expected' => 'title,;|+"alpha, beta + gamma"+guid',
+ 'texts' => array(
+ 'columns' => '"title,;|", "alpha, beta + gamma", guid',
+ ),
),
// Ensure that when a source key is used multiple times in mapping, the
@@ -244,10 +271,12 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
array(
'source' => 'text',
'target' => 'title',
+ 'unique' => TRUE,
),
array(
'source' => 'guid',
'target' => 'guid',
+ 'unique' => TRUE,
),
array(
'source' => 'date',
@@ -263,6 +292,10 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
),
),
'expected' => 'text,guid,date',
+ 'texts' => array(
+ 'columns' => 'text, guid, date',
+ 'unique' => 'Columns text, guid are mandatory and values in these columns are considered unique',
+ ),
),
// Special characters. Things like '&' shouldn't be converted to '&'
@@ -273,6 +306,7 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
array(
'source' => '&',
'target' => 'title',
+ 'unique' => TRUE,
),
array(
'source' => 'alpha&beta',
@@ -288,6 +322,31 @@ class FeedsCSVParserTestCase extends FeedsWebTestCase {
),
),
'expected' => '&,alpha&beta,<created>,\'guid\'',
+ 'texts' => array(
+ 'columns' => '&, alpha&beta, <created>, \'guid\'',
+ 'unique' => 'Column & is mandatory and considered unique',
+ ),
+ ),
+
+ // Blank sources (source which name only contains spaces) should not end
+ // up in the template, but a zero should.
+ array(
+ 'delimiter' => ',',
+ 'mapping' => array(
+ array(
+ 'source' => '0',
+ 'target' => 'body',
+ ),
+ array(
+ 'source' => ' ',
+ 'target' => 'guid',
+ 'unique' => TRUE,
+ ),
+ ),
+ 'expected' => '0',
+ 'texts' => array(
+ 'columns' => '0',
+ ),
),
);
}
--
GitLab