From 9ac7872b50d430506fd035c5b4cb5bca1e8940aa Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Fri, 17 Sep 2010 23:55:35 +0000
Subject: [PATCH] Fix calls to db_query_range().
---
feeds_ui/feeds_ui.module | 2 +-
includes/FeedsImporter.inc | 2 +-
includes/FeedsSource.inc | 2 +-
plugins/FeedsNodeProcessor.inc | 10 ++++++----
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/feeds_ui/feeds_ui.module b/feeds_ui/feeds_ui.module
index 35b9fdf9..de1a329d 100644
--- a/feeds_ui/feeds_ui.module
+++ b/feeds_ui/feeds_ui.module
@@ -20,7 +20,7 @@ function feeds_ui_help($path, $arg) {
*/
function feeds_ui_menu() {
$items = array();
- $items['admin/structure/import'] = array(
+ $items['admin/structure/feeds'] = array(
'title' => 'Feeds',
'description' => 'Configure one or more Feeds importers to aggregate RSS and Atom feeds, import CSV files or more.',
'page callback' => 'drupal_get_form',
diff --git a/includes/FeedsImporter.inc b/includes/FeedsImporter.inc
index c02257fd..b47119d9 100644
--- a/includes/FeedsImporter.inc
+++ b/includes/FeedsImporter.inc
@@ -99,7 +99,7 @@ class FeedsImporter extends FeedsConfigurable {
$save = new stdClass();
$save->id = $this->id;
$save->config = $this->getConfig();
- if (db_query_range("SELECT 1 FROM {feeds_importer} WHERE id = '%s'", array(':id' => $this->id), 0, 1)->fetchField()) {
+ if (db_query_range("SELECT 1 FROM {feeds_importer} WHERE id = '%s'", 0, 1, array(':id' => $this->id))->fetchField()) {
drupal_write_record('feeds_importer', $save, 'id');
}
else {
diff --git a/includes/FeedsSource.inc b/includes/FeedsSource.inc
index 39014b22..90bde3aa 100644
--- a/includes/FeedsSource.inc
+++ b/includes/FeedsSource.inc
@@ -242,7 +242,7 @@ class FeedsSource extends FeedsConfigurable {
'source' => $source,
'batch' => isset($this->batch) ? $this->batch : FALSE,
);
- if (db_query_range("SELECT 1 FROM {feeds_source} WHERE id = :id AND feed_nid = :nid", array(':id' => $this->id, ':nid' => $this->feed_nid), 0, 1)->fetchField()) {
+ if (db_query_range("SELECT 1 FROM {feeds_source} WHERE id = :id AND feed_nid = :nid", 0, 1, array(':id' => $this->id, ':nid' => $this->feed_nid))->fetchField()) {
drupal_write_record('feeds_source', $object, array('id', 'feed_nid'));
}
else {
diff --git a/plugins/FeedsNodeProcessor.inc b/plugins/FeedsNodeProcessor.inc
index a6de53cb..c85a9d1e 100644
--- a/plugins/FeedsNodeProcessor.inc
+++ b/plugins/FeedsNodeProcessor.inc
@@ -92,12 +92,13 @@ class FeedsNodeProcessor extends FeedsProcessor {
$total = db_query("SELECT COUNT(nid) FROM {feeds_node_item} WHERE id = :id AND feed_nid =:nid", array(':id' => $source->id, ':nid' => $source->feed_nid))->fetchField();
$batch->setTotal(FEEDS_CLEARING, $total);
}
- $nodes = db_query_range("SELECT nid FROM {feeds_node_item} WHERE id = :id AND feed_nid =:nid", array(':id' => $source->id, ':nid' => $source->feed_nid), variable_get('feeds_node_batch_size', FEEDS_NODE_BATCH_SIZE));
+ $count = variable_get('feeds_node_batch_size', FEEDS_NODE_BATCH_SIZE);
+ $nodes = db_query_range("SELECT nid FROM {feeds_node_item} WHERE id = :id AND feed_nid =:nid", 0, $count, array(':id' => $source->id, ':nid' => $source->feed_nid));
foreach ($nodes as $node) {
node_delete($node->nid);
$batch->deleted++;
}
- if (db_query_range("SELECT 1 FROM {feeds_node_item} WHERE id = :id AND feed_nid =:nid", array(':id' => $source->id, ':nid' => $source->feed_nid), 0, 1)->fetchField()) {
+ if (db_query_range("SELECT 1 FROM {feeds_node_item} WHERE id = :id AND feed_nid =:nid", 0, 1, array(':id' => $source->id, ':nid' => $source->feed_nid))->fetchField()) {
$batch->setProgress(FEEDS_CLEARING, $batch->deleted);
return;
}
@@ -123,11 +124,12 @@ class FeedsNodeProcessor extends FeedsProcessor {
if ($time == FEEDS_EXPIRE_NEVER) {
return;
}
- $nodes = db_query_range("SELECT n.nid FROM {node} n JOIN {feeds_node_item} fni ON n.nid = fni.nid WHERE fni.id = :id AND n.created < :created", array(':id' => $this->id, ':created' => REQUEST_TIME - $time), 0, variable_get('feeds_node_batch_size', FEEDS_NODE_BATCH_SIZE));
+ $count = variable_get('feeds_node_batch_size', FEEDS_NODE_BATCH_SIZE);
+ $nodes = db_query_range("SELECT n.nid FROM {node} n JOIN {feeds_node_item} fni ON n.nid = fni.nid WHERE fni.id = :id AND n.created < :created", 0, $count, array(':id' => $this->id, ':created' => REQUEST_TIME - $time));
foreach ($nodes as $node) {
_feeds_node_delete($node->nid);
}
- if (db_query_range("SELECT 1 FROM {node} n JOIN {feeds_node_item} fni ON n.nid = fni.nid WHERE fni.id = :id AND n.created < :created", array(':id' => $this->id, ':created' => REQUEST_TIME - $time), 0, 1)->fetchField()) {
+ if (db_query_range("SELECT 1 FROM {node} n JOIN {feeds_node_item} fni ON n.nid = fni.nid WHERE fni.id = :id AND n.created < :created", 0, 1, array(':id' => $this->id, ':created' => REQUEST_TIME - $time))->fetchField()) {
return FEEDS_BATCH_ACTIVE;
}
return FEEDS_BATCH_COMPLETE;
--
GitLab