Commit 15bd7a6c6be2dc15114895ca98bf340cbb850eb7

Authored by kevin_fourie
1 parent 4d56e6b8

Merged in from STABLE 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/branches/3.5.3-Release-Branch@9100 c91229c3-7414-0410-bfa2-8a42b809f60b
search2/indexing/extractorCore.inc.php
... ... @@ -495,7 +495,7 @@ abstract class OOFallbackDocumentExtractor extends ExternalDocumentExtractor
495 495 $config = KTConfig::getSingleton();
496 496 $this->params = $config->get('indexer/' . $cmd . 'cmdline', $params);
497 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 500 $this->cmd = false;
501 501 }
... ...