From 9031b096d4a81c2bb1df5a4c1ed89223b34d7895 Mon Sep 17 00:00:00 2001
From: Conrad Vermeulen <conrad@knowledgetree.com>
Date: Fri, 26 Oct 2007 10:35:48 +0000
Subject: [PATCH] KTS-2599 "Indexing files with no extractors associated results in the index queue filling up" Fixed.

---
 search2/indexing/indexerCore.inc.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/search2/indexing/indexerCore.inc.php b/search2/indexing/indexerCore.inc.php
index d6f54d0..f82443d 100755
--- a/search2/indexing/indexerCore.inc.php
+++ b/search2/indexing/indexerCore.inc.php
@@ -755,7 +755,7 @@ abstract class Indexer
 					INNER JOIN document_metadata_version dmv ON d.metadata_version_id=dmv.id
 					INNER JOIN document_content_version dcv ON dmv.content_version_id=dcv.id
 					INNER JOIN mime_types mt ON dcv.mime_id=mt.id
-					INNER JOIN mime_extractors me ON mt.extractor_id=me.id
+					LEFT JOIN mime_extractors me ON mt.extractor_id=me.id
  				WHERE
  					(iff.processdate IS NULL or iff.processdate < cast(cast('$date' as date) -1 as date)) AND dmv.status_id=1
 				ORDER BY indexdate
@@ -807,12 +807,6 @@ abstract class Indexer
         		$default->log->debug(sprintf(_kt("Indexing docid: %d extension: '%s' mimetype: '%s' extractor: '%s'"), $docId, $extension,$mimeType,$extractorClass));
         	}
 
-        	if (!$this->isExtractorEnabled($extractorClass))
-			{
-				$default->log->info(sprintf(_kt("diagnose: Not indexing docid: %d because extractor '%s' is disabled."), $docId, $extractorClass));
-				continue;
-			}
-
         	if (empty($extractorClass))
         	{
 	        	if ($this->debug)
@@ -824,9 +818,15 @@ abstract class Indexer
         		continue;
         	}
 
+        	if (!$this->isExtractorEnabled($extractorClass))
+			{
+				$default->log->info(sprintf(_kt("diagnose: Not indexing docid: %d because extractor '%s' is disabled."), $docId, $extractorClass));
+				continue;
+			}
+
         	if ($this->debug)
         	{
-        		$default->log->info(sprintf(_kt("Processing document %d.\n"),$docId));
+        		$default->log->info(sprintf(_kt("Processing docid: %d.\n"),$docId));
         	}
 
         	$removeFromQueue = true;
--
libgit2 0.21.4