diff --git a/feeds.info b/feeds.info
index 0ce45e05669f31e92ac4a97de2ce9407a0b202a1..ec2ffda173c2924acf512d3e710a7eed1b889dca 100644
--- a/feeds.info
+++ b/feeds.info
@@ -48,6 +48,7 @@ files[] = tests/feeds_processor_term.test
files[] = tests/feeds_processor_user.test
files[] = tests/feeds_scheduler.test
files[] = tests/feeds_mapper_link.test
+files[] = tests/feeds_mapper_summary.test
files[] = tests/feeds_mapper_taxonomy.test
files[] = tests/http_request.test
files[] = tests/parser_csv.test
diff --git a/mappers/text.inc b/mappers/text.inc
index 564675375e8f3fe53cbdf4ee11d5e3cc6b7b0300..48d9d7f82118ab8361f96c2e3e166b40d73568af 100644
--- a/mappers/text.inc
+++ b/mappers/text.inc
@@ -26,6 +26,15 @@ function text_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_nam
'callback' => 'text_feeds_set_target',
'description' => t('The @label field of the entity.', array('@label' => $instance['label'])),
);
+ if ($info['type'] == 'text_with_summary') {
+ // Allow mapping to summary.
+ $targets[$name . ':summary'] = array(
+ 'name' => t('@name: Summary', array('@name' => $instance['label'])),
+ 'callback' => 'text_feeds_set_target',
+ 'description' => t('The @label field of the entity.', array('@label' => $instance['label'])),
+ 'real_target' => $name,
+ );
+ }
}
}
}
@@ -34,28 +43,33 @@ function text_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_nam
* Callback for mapping text fields.
*/
function text_feeds_set_target($source, $entity, $target, array $values) {
- if (isset($source->importer->processor->config['input_format'])) {
+ list($field_name, $column) = explode(':', $target . ':value');
+
+ if ($column === 'value' && isset($source->importer->processor->config['input_format'])) {
$format = $source->importer->processor->config['input_format'];
}
- $field = isset($entity->$target) ? $entity->$target : array('und' => array());
+ $field = isset($entity->$field_name) ? $entity->$field_name : array('und' => array());
// Iterate over all values.
+ $delta = 0;
foreach ($values as $value) {
- if (is_object($value) && ($value instanceof FeedsElement)) {
+ if (is_object($value) && $value instanceof FeedsElement) {
$value = $value->getValue();
}
if (is_scalar($value) && strlen($value)) {
- $value = array('value' => (string) $value);
+
+ $field['und'][$delta][$column] = (string) $value;
+
if (isset($format)) {
- $value['format'] = $format;
+ $field['und'][$delta]['format'] = $format;
}
-
- $field['und'][] = $value;
}
+
+ $delta++;
}
- $entity->$target = $field;
+ $entity->$field_name = $field;
}
diff --git a/tests/feeds/node_summary.csv b/tests/feeds/node_summary.csv
new file mode 100644
index 0000000000000000000000000000000000000000..f6e731e32bcb264182bf76a494b072b0e2de07ce
--- /dev/null
+++ b/tests/feeds/node_summary.csv
@@ -0,0 +1,4 @@
+"guid","title","summary","body"
+1,"Lorem ipsum","Lorem ipsum summary","Lorem ipsum body"
+2,"Ut wisi enim ad minim veniam","","Ut wisi enim ad minim veniam body"
+3,"Duis autem vel eum iriure dolor","",""
diff --git a/tests/feeds_mapper_summary.test b/tests/feeds_mapper_summary.test
new file mode 100644
index 0000000000000000000000000000000000000000..88cf9f17fd16feaea12c8825d4371043c8c2e7b5
--- /dev/null
+++ b/tests/feeds_mapper_summary.test
@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * @file
+ * Test case for mapping to node summary.
+ */
+
+/**
+ * Class for testing Feeds summary mapper.
+ */
+class FeedsMapperNodeSummaryTestCase extends FeedsMapperTestCase {
+ public static function getInfo() {
+ return array(
+ 'name' => 'Mapper: Text with summary',
+ 'description' => 'Test Feeds Mapper support for text with summary fields.',
+ 'group' => 'Feeds',
+ );
+ }
+
+ /**
+ * Tests importing CSV files for text fields with summary.
+ */
+ public function test() {
+ // Create and configure importer.
+ $this->createImporterWithSummaryMapper();
+
+ // Create a new filter format.
+ $format = drupal_strtolower($this->randomName());
+ $edit = array(
+ 'format' => $format,
+ 'name' => $this->randomName(),
+ // Authenticated users.
+ 'roles[2]' => TRUE,
+ );
+ $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration'));
+
+ // The "update existing" and "skip hash check" are turned on so we can test
+ // later if the summaries of the nodes get overwritten with the values from
+ // the source.
+ $this->setSettings('syndication', 'FeedsNodeProcessor', array(
+ 'update_existing' => 2,
+ 'skip_hash_check' => TRUE,
+ 'input_format' => $format,
+ ));
+
+ // Import CSV file.
+ $this->importFile('syndication', $this->absolutePath() . '/tests/feeds/node_summary.csv');
+ $this->assertText('Created 3 nodes');
+ $this->assertNodeSummaryValues();
+
+ // Check that text format is applied correctly.
+ $this->drupalGet('node/1/edit');
+ $this->assertNodeFieldValue('format', $format);
+
+ // Check the teasers of the three imported nodes, assumed to be all present
+ // on the front page.
+ $this->assertNodeTeaserValues();
+
+ // Set a summary and a text for each imported node.
+ $edit = array(
+ 'body[und][0][summary]' => 'Nam liber tempor summary',
+ 'body[und][0][value]' => 'Nam liber tempor body',
+ );
+ $this->drupalPost('node/1/edit', $edit, t('Save'));
+ $this->drupalPost('node/2/edit', $edit, t('Save'));
+ $this->drupalPost('node/3/edit', $edit, t('Save'));
+
+ // Import the same CSV file again.
+ $this->importFile('syndication', $this->absolutePath() . '/tests/feeds/node_summary.csv');
+ $this->assertText('Updated 3 nodes');
+ $this->assertNodeSummaryValues();
+ $this->assertNodeTeaserValues();
+
+ // The previous texts of the nodes should no longer be visible.
+ $this->assertNoText('Nam liber tempor summary');
+ $this->assertNoText('Nam liber tempor body');
+
+ // Check that text format is applied correctly.
+ $this->drupalGet('node/1/edit');
+ $this->assertNodeFieldValue('format', $format);
+ $this->drupalGet('node/2/edit');
+ $this->assertNodeFieldValue('format', $format);
+ $this->drupalGet('node/3/edit');
+ $this->assertNodeFieldValue('format', $format);
+
+ // Remove the body mapping to check that the text format doesn't get updated
+ // from the summary.
+ $this->removeMappings('syndication', array(
+ 2 => array(
+ 'source' => 'body',
+ 'target' => 'body',
+ ),
+ ));
+
+ // Change the text format and remove the body mapping to ensure that the
+ // text format doesn't change.
+ $this->setSettings('syndication', 'FeedsNodeProcessor', array(
+ 'input_format' => 'plain_text',
+ ));
+ $this->importFile('syndication', $this->absolutePath() . '/tests/feeds/node_summary.csv');
+ $this->assertText('Updated 3 nodes');
+
+ // Check that text format remains at its previous value.
+ $this->drupalGet('node/1/edit');
+ $this->assertNodeFieldValue('format', $format);
+ $this->drupalGet('node/2/edit');
+ $this->assertNodeFieldValue('format', $format);
+ $this->drupalGet('node/3/edit');
+ $this->assertNodeFieldValue('format', $format);
+ }
+
+ /**
+ * Creates an importer with a summary mapper.
+ *
+ * @param $name
+ * The natural name of the feed.
+ * @param $id
+ * The persistent id of the feed.
+ *
+ * @return void
+ */
+ protected function createImporterWithSummaryMapper($name = 'Syndication', $id = 'syndication') {
+ // Create content type. A field named "body" which is of type "Long text and summary"
+ // will be created by default, so we don't need to create a field of that type here.
+ $typename = $this->createContentType(array());
+
+ // Create and configure importer.
+ $this->createImporterConfiguration($name, $id);
+ $this->setSettings('syndication', NULL, array(
+ 'content_type' => '',
+ 'import_period' => FEEDS_SCHEDULE_NEVER,
+ ));
+ $this->setPlugin('syndication', 'FeedsFileFetcher');
+ $this->setPlugin('syndication', 'FeedsCSVParser');
+ $this->setSettings('syndication', 'FeedsNodeProcessor', array('bundle' => $typename));
+ $this->addMappings('syndication', array(
+ 0 => array(
+ 'source' => 'title',
+ 'target' => 'title',
+ ),
+ 1 => array(
+ 'source' => 'summary',
+ 'target' => 'body:summary',
+ ),
+ 2 => array(
+ 'source' => 'body',
+ 'target' => 'body',
+ ),
+ 3 => array(
+ 'source' => 'guid',
+ 'target' => 'guid',
+ 'unique' => TRUE,
+ ),
+ ));
+ }
+
+ /**
+ * Overrides FeedsMapperTestCase::getFormFieldsNames().
+ *
+ * Returns different form field names for:
+ * - body
+ * This field doesn't have the "field_" prefix.
+ * - summary
+ * Which is part of the body field.
+ * - format
+ * The format of the body field.
+ */
+ protected function getFormFieldsNames($field_name, $index) {
+ switch ($field_name) {
+ case 'body':
+ return array("body[und][{$index}][value]");
+
+ case 'summary':
+ return array("body[und][{$index}][summary]");
+
+ case 'format':
+ return array("body[und][{$index}][format]");
+ }
+
+ return parent::getFormFieldsNames($field_name, $index);
+ }
+
+ /**
+ * Checks that the nodes match the imported values.
+ */
+ protected function assertNodeSummaryValues() {
+ // Check the three imported nodes.
+ $this->drupalGet('node/1/edit');
+ $this->assertNodeFieldValue('summary', 'Lorem ipsum summary');
+ $this->assertNodeFieldValue('body', 'Lorem ipsum body');
+ $this->drupalGet('node/2/edit');
+ $this->assertNodeFieldValue('summary', '');
+ $this->assertNodeFieldValue('body', 'Ut wisi enim ad minim veniam body');
+ $this->drupalGet('node/3/edit');
+ $this->assertNodeFieldValue('summary', '');
+ $this->assertNodeFieldValue('body', '');
+ }
+
+ /**
+ * Checks the frontpage for teaser values.
+ */
+ protected function assertNodeTeaserValues() {
+ $this->drupalGet('');
+ $this->assertText('Lorem ipsum summary');
+ $this->assertNoText('Lorem ipsum body');
+ $this->assertText('Ut wisi enim ad minim veniam body');
+ }
+
+}