diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c9fe52c7ac3e4806ed15ac9ca63919f205b90c4a..77cce41c25527dd4868aaa87293b0b8a2a1bb287 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,12 @@ // $Id$ + +Feeds 6.x 1.0 xxxxx xx, 2010-xx-xx +---------------------------------- + +- #718474 jerdavis: In FeedsNodeProcessor, check for duplicate items within + same importer id. + Feeds 6.x 1.0 Alpha 12, 2010-02-23 ---------------------------------- diff --git a/plugins/FeedsNodeProcessor.inc b/plugins/FeedsNodeProcessor.inc index 17caa5a77b8b97ba388f9b4a3b5f1a777c4094f6..24ea7c7e682b58b0b990a8ae26ab07f64249bb26 100644 --- a/plugins/FeedsNodeProcessor.inc +++ b/plugins/FeedsNodeProcessor.inc @@ -274,10 +274,10 @@ class FeedsNodeProcessor extends FeedsProcessor { foreach ($this->uniqueTargets($source_item) as $target => $value) { switch ($target) { case 'url': - $nid = db_result(db_query('SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND url = "%s"', $source->feed_nid, $value)); + $nid = db_result(db_query('SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND id = "%s" AND url = "%s"', $source->feed_nid, $source->id, $value)); break; case 'guid': - $nid = db_result(db_query('SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND guid = "%s"', $source->feed_nid, $value)); + $nid = db_result(db_query('SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND id = "%s" AND guid = "%s"', $source->feed_nid, $source->id, $value)); break; } if ($nid) {