diff --git a/CHANGELOG.txt b/CHANGELOG.txt index bea58f2e9d8ec82c406a92bdbee1b8e136b3c0ed..759143c3f7522ce85c715fecadd5d99e78f5b4eb 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ Feeds 6.x 1.0 xxxxxxxxxxxxxxxxxxxx ---------------------------------- +- #704236 jerdavis: Support mapping to CCK float field. - #783820 klonos: Fix warning: copy() [function.copy]: Filename cannot be empty in FeedsParser.inc on line 168. - #778416 clemens.tolboom: Better message when plugin is missing. diff --git a/mappers/content.inc b/mappers/content.inc index 506a76c069e1b4aac7948c41a085dff63f432796..f1f2c6c5d20a33134866f7634fb2bc0c36d9591c 100644 --- a/mappers/content.inc +++ b/mappers/content.inc @@ -16,7 +16,7 @@ function content_feeds_node_processor_targets_alter(&$targets, $content_type) { $fields = array(); if (isset($info['fields']) && count($info['fields'])) { foreach ($info['fields'] as $field_name => $field) { - if (in_array($field['type'], array('text', 'number_integer', 'number_decimal'))) { + if (in_array($field['type'], array('text', 'number_integer', 'number_decimal', 'number_float'))) { $fields[$field_name] = isset($field['widget']['label']) ? $field['widget']['label'] : $field_name; } } diff --git a/tests/feeds/content.csv b/tests/feeds/content.csv index c91dda76064feb1d34333986910c46677e5e8313..1e68bdf865ddc8e4900ead66e83b46bce1938a6f 100644 --- a/tests/feeds/content.csv +++ b/tests/feeds/content.csv @@ -1,3 +1,3 @@ -"guid","title","created","alpha","beta","gamma","body" -1,"Lorem ipsum",1251936720,"Lorem",42,"4.2","Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat." -2,"Ut wisi enim ad minim veniam",1251932360,"Ut wisi",32,"1.2","Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat." +"guid","title","created","alpha","beta","gamma","delta","body" +1,"Lorem ipsum",1251936720,"Lorem",42,"4.2",3.14159265,"Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat." +2,"Ut wisi enim ad minim veniam",1251932360,"Ut wisi",32,"1.2",5.62951413,"Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat." diff --git a/tests/feeds_mapper_content.test b/tests/feeds_mapper_content.test index ea54ad7ccb242995c870b0786cb037958c39fdbf..022e0ffafe6aabeeccae24f1fcbddcdcffa6cbe1 100644 --- a/tests/feeds_mapper_content.test +++ b/tests/feeds_mapper_content.test @@ -44,11 +44,12 @@ class FeedsMapperContentTestCase extends FeedsMapperTestCase { */ function test() { - // Create content type. - $typename = $this->createContentType(NULL, array( + // Create content type. + $typename = $this->createContentType(NULL, array( 'alpha' => 'text', 'beta' => 'number_integer', 'gamma' => 'number_decimal', + 'delta' => 'number_float', )); // Create and configure importer. @@ -82,6 +83,10 @@ class FeedsMapperContentTestCase extends FeedsMapperTestCase { 'source' => 'gamma', 'target' => 'field_gamma', ), + array( + 'source' => 'delta', + 'target' => 'field_delta', + ), )); // Import CSV file. @@ -93,10 +98,12 @@ class FeedsMapperContentTestCase extends FeedsMapperTestCase { $this->assertCCKFieldValue('alpha', 'Lorem'); $this->assertCCKFieldValue('beta', '42'); $this->assertCCKFieldValue('gamma', '4.20'); + $this->assertCCKFieldValue('delta', '3.14159'); $this->drupalGet('node/2/edit'); $this->assertCCKFieldValue('alpha', 'Ut wisi'); $this->assertCCKFieldValue('beta', '32'); $this->assertCCKFieldValue('gamma', '1.20'); + $this->assertCCKFieldValue('delta', '5.62951'); } }