From 628793b055837b3b5517c87572ab3dcce7ceb5f5 Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Mon, 2 Nov 2009 20:40:22 +0000
Subject: [PATCH] Split number of items to queue on cron run from
 feeds_schedule_num variable.

---
 CHANGELOG.txt               |  2 ++
 README.txt                  | 13 +++++++++----
 includes/FeedsScheduler.inc |  6 ++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index aed359d7..28d8d76d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,8 @@
 Feeds 6.x 1.0 xxx, 2009-xx-xx
 -----------------------------
 
+- Split number of items to queue on cron from feeds_schedule_num variable
+  (see README.txt)
 - #619110 Fix node_delete() in FeedsNodeProcessor
 - Add descriptions to all mapping sources and targets
 
diff --git a/README.txt b/README.txt
index dc6a7596..62081796 100644
--- a/README.txt
+++ b/README.txt
@@ -91,10 +91,15 @@ Description: Execution time for a queue worker, only effective if used with
 
 Name:        feeds_schedule_num
 Default:     5
-             200 if drupal_queue is enabled
-Description: The number of feeds to refresh on cron time.
-             If drupal_queue is enabled, the maximum number of feeds to move to
-             queue.
+Description: The number of feeds to import on cron time.
+             Only has an effect if Drupal Queue is *not* enabled.
+             http://drupal.org/project/drupal_queue
+
+Name:        feeds_schedule_queue_num
+Default:     200
+             The number of feeds to queue on cron time. Only has an effect if
+             Drupal Queue is enabled.
+             http://drupal.org/project/drupal_queue
 
 Glossary
 ========
diff --git a/includes/FeedsScheduler.inc b/includes/FeedsScheduler.inc
index cf1a7899..f3817bee 100644
--- a/includes/FeedsScheduler.inc
+++ b/includes/FeedsScheduler.inc
@@ -110,9 +110,11 @@ class FeedsScheduler implements IFeedsScheduler {
       if ($use_queue = module_exists('drupal_queue')) {
         drupal_queue_include();
         $queue = drupal_queue_get(FEEDS_SCHEDULER_QUEUE);
+        $num = variable_get('feeds_schedule_queue_num', 200);
+      }
+      else {
+        $num = variable_get('feeds_schedule_num', 5);
       }
-      $num = variable_get('feeds_schedule_num', $use_queue ? 200 : 5);
-      $num = $num ? $num : 1;
 
       // Iterate over feed configurations, pick $num feeds for each
       // configuration, push to queue or refresh feeds.
-- 
GitLab