diff --git a/search2/indexing/extractorCore.inc.php b/search2/indexing/extractorCore.inc.php index ba0e5e9..c153ba6 100755 --- a/search2/indexing/extractorCore.inc.php +++ b/search2/indexing/extractorCore.inc.php @@ -456,7 +456,7 @@ abstract class ApplicationExtractor extends ExternalDocumentExtractor { $sources = array('{source}','{target}'); $target = array($this->sourcefile, $this->targetfile); - $cmdline = $this->command . ' ' . str_replace($sources,$target, $this->params); + $cmdline = $this->application . ' ' . str_replace($sources,$target, $this->params); return $cmdline; } diff --git a/search2/indexing/extractors/PDFExtractor.inc.php b/search2/indexing/extractors/PDFExtractor.inc.php index 54fb672..a6d34e9 100755 --- a/search2/indexing/extractors/PDFExtractor.inc.php +++ b/search2/indexing/extractors/PDFExtractor.inc.php @@ -40,7 +40,10 @@ class PDFExtractor extends ApplicationExtractor { public function __construct() { - parent::__construct('externalBinary','pdftotext','pdftotext',_kt('PDF Text Extractor'),'-nopgbrk -enc UTF-8 \'{source}\' \'{target}\''); + $config = KTConfig::getSingleton(); + $params = $config->get('extractorParameters/pdftotext', '-nopgbrk -enc UTF-8 \'{source}\' \'{target}\''); + + parent::__construct('externalBinary','pdftotext','pdftotext',_kt('PDF Text Extractor'),$params); } public function getSupportedMimeTypes() diff --git a/search2/indexing/extractors/PSExtractor.inc.php b/search2/indexing/extractors/PSExtractor.inc.php index 8fff6d0..fd60b74 100755 --- a/search2/indexing/extractors/PSExtractor.inc.php +++ b/search2/indexing/extractors/PSExtractor.inc.php @@ -40,7 +40,10 @@ class PSExtractor extends ApplicationExtractor { public function __construct() { - parent::__construct('externalBinary','pstotext','pstotext',_kt('PostScript Text Extractor'),'-nopgbrk -enc UTF-8 {source} {target}'); + $config = KTConfig::getSingleton(); + $params = $config->get('extractorParameters/pstotext', '\'{source}\' > \'{target}\''); + + parent::__construct('externalBinary','pstotext','pstotext',_kt('PostScript Text Extractor'), $params); } public function getSupportedMimeTypes() @@ -56,6 +59,7 @@ class PSExtractor extends ApplicationExtractor { if (OS_WINDOWS) { + // pstotext is not available under windows, so no need to diagnose it return null; } return parent::diagnose();