From dd868a1cf8ce05e1ec6db89f7cc8775bd69844cc Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Mon, 11 Aug 2008 14:40:50 +0000 Subject: [PATCH] Merged in from STABLE trunk... --- search2/indexing/extractorCore.inc.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/search2/indexing/extractorCore.inc.php b/search2/indexing/extractorCore.inc.php index 8f5aaa1..a50d31a 100755 --- a/search2/indexing/extractorCore.inc.php +++ b/search2/indexing/extractorCore.inc.php @@ -340,6 +340,7 @@ abstract class DocumentExtractor abstract class ExternalDocumentExtractor extends DocumentExtractor { protected $allowOutput = false; + protected $pipeStdoutToDevNull = false; /** * Initialise the extractor. @@ -396,7 +397,15 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor $script = "#!/bin/sh\n"; $script .= "# This is an auto generated file. \n"; - $script .= $cmd . ' 2>>"' . $script_out . "\" >/dev/null\n"; + $script .= $cmd . ' 2>>"' . $script_out . "\""; + + if ($this->pipeStdoutToDevNull) + { + $script .= " >/dev/null"; + } + + $script .= "\n"; + $script .= "exit $?\n"; } @@ -552,6 +561,7 @@ abstract class OOFallbackDocumentExtractor extends ExternalDocumentExtractor $this->setIndexingStatus($this->oo->getIndexingStatus()); $this->setExtractionStatus($this->oo->getExtractionStatus()); + $this->setTargetFile($this->oo->getTargetFile()); return $result; } -- libgit2 0.21.4