From 18527892f9c05db609f2a06e90cd80da92cf2b01 Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Tue, 23 Feb 2010 22:18:09 +0000
Subject: [PATCH] #718474 jerdavis: In FeedsNodeProcessor, check for duplicate
items within same importer id.
---
CHANGELOG.txt | 7 +++++++
plugins/FeedsNodeProcessor.inc | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c9fe52c7..77cce41c 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 17caa5a7..24ea7c7e 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) {
--
GitLab