From 9e39a9561bccd07ddf0f69bc666036407eb16327 Mon Sep 17 00:00:00 2001
From: Megan Watson <megan@knowledgetree.com>
Date: Mon, 23 Nov 2009 14:55:42 +0200
Subject: [PATCH] The document is unqueued after all processors have run, irrespective of the outcome or mimetype. PT: 1789294

---
 search2/documentProcessor/documentProcessor.inc.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/search2/documentProcessor/documentProcessor.inc.php b/search2/documentProcessor/documentProcessor.inc.php
index 9967e57..2532a63 100644
--- a/search2/documentProcessor/documentProcessor.inc.php
+++ b/search2/documentProcessor/documentProcessor.inc.php
@@ -246,6 +246,11 @@ class DocumentProcessor
         global $default;
         $default->log->debug('documentProcessor: starting processing');
 
+        if($this->processors === false){
+            $default->log->info('documentProcessor: stopping - no processors enabled');
+            return ;
+        }
+
         // Get processing queue
         // Use the same batch size as the indexer (for now)
         // If the batch size is huge then reset it to a smaller number
@@ -286,9 +291,8 @@ class DocumentProcessor
                     // Process document
                     $processor->setDocument($document);
                     $processor->processDocument();
-
-                    Indexer::unqueueDocFromProcessing($docId, "Document processed", 'debug');
                 }
+                Indexer::unqueueDocFromProcessing($docId, "Document processed", 'debug');
             }
         }
 
--
libgit2 0.21.4