Peter M. Groen / knowledgetree

Commit 9031b096d4a81c2bb1df5a4c1ed89223b34d7895

Authored by Conrad Vermeulen
1 parent b65eacb0

KTS-2599 

"Indexing files with no extractors associated results in the index queue filling up"
Fixed. 

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7587 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
search2/indexing/indexerCore.inc.php
  View file @9031b09
... ... @@ -755,7 +755,7 @@ abstract class Indexer
755 755 INNER JOIN document_metadata_version dmv ON d.metadata_version_id=dmv.id
756 756 INNER JOIN document_content_version dcv ON dmv.content_version_id=dcv.id
757 757 INNER JOIN mime_types mt ON dcv.mime_id=mt.id
758   - INNER JOIN mime_extractors me ON mt.extractor_id=me.id
  758 + LEFT JOIN mime_extractors me ON mt.extractor_id=me.id
759 759 WHERE
760 760 (iff.processdate IS NULL or iff.processdate < cast(cast('$date' as date) -1 as date)) AND dmv.status_id=1
761 761 ORDER BY indexdate
... ... @@ -807,12 +807,6 @@ abstract class Indexer
807 807 $default->log->debug(sprintf(_kt("Indexing docid: %d extension: '%s' mimetype: '%s' extractor: '%s'"), $docId, $extension,$mimeType,$extractorClass));
808 808 }
809 809  
810   - if (!$this->isExtractorEnabled($extractorClass))
811   - {
812   - $default->log->info(sprintf(_kt("diagnose: Not indexing docid: %d because extractor '%s' is disabled."), $docId, $extractorClass));
813   - continue;
814   - }
815   -
816 810 if (empty($extractorClass))
817 811 {
818 812 if ($this->debug)
... ... @@ -824,9 +818,15 @@ abstract class Indexer
824 818 continue;
825 819 }
826 820  
  821 + if (!$this->isExtractorEnabled($extractorClass))
  822 + {
  823 + $default->log->info(sprintf(_kt("diagnose: Not indexing docid: %d because extractor '%s' is disabled."), $docId, $extractorClass));
  824 + continue;
  825 + }
  826 +
827 827 if ($this->debug)
828 828 {
829   - $default->log->info(sprintf(_kt("Processing document %d.\n"),$docId));
  829 + $default->log->info(sprintf(_kt("Processing docid: %d.\n"),$docId));
830 830 }
831 831  
832 832 $removeFromQueue = true;
... ...