Peter M. Groen / knowledgetree

Commit b97e65219f27f0981bbfc25b66a6843d6ca91753

Authored by kevin_fourie
1 parent d0c7a67b

Merged in from DEV trunk... 

KTS-3456
"Allow indexing to not be dependant on open office"
Fixed.  Unfortunately, we have to keep it for windows. catdoc, etc does not work properly in windows.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@9099 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
search2/indexing/extractorCore.inc.php
  View file @b97e652
@@ -495,7 +495,7 @@ abstract class OOFallbackDocumentExtractor extends ExternalDocumentExtractor @@ -495,7 +495,7 @@ abstract class OOFallbackDocumentExtractor extends ExternalDocumentExtractor
495 $config = KTConfig::getSingleton(); 495 $config = KTConfig::getSingleton();
496 $this->params = $config->get('indexer/' . $cmd . 'cmdline', $params); 496 $this->params = $config->get('indexer/' . $cmd . 'cmdline', $params);
497 $this->useOO = $config->get('indexer/useOpenOffice', true); 497 $this->useOO = $config->get('indexer/useOpenOffice', true);
498 - if (!$config->get('indexer/use_' . $cmd, true)) 498 + if (!$config->get('indexer/use_' . $cmd, true) || OS_WINDOWS)
499 { 499 {
500 $this->cmd = false; 500 $this->cmd = false;
501 } 501 }