diff --git a/search2/indexing/extractorCore.inc.php b/search2/indexing/extractorCore.inc.php index 2a6cfa9..85a7825 100644 --- a/search2/indexing/extractorCore.inc.php +++ b/search2/indexing/extractorCore.inc.php @@ -370,10 +370,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor $script_name = $script_prefix . '.bat'; $script = "rem This is an auto generated file. \n"; - $script .= $cmd . ' 2> "' . $script_out . "\"\r\n"; - - - + $script .= $cmd . ' 2>>"' . $script_out . '" >>"' . $script_out . "\"\r\n"; } else { @@ -381,7 +378,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor $script = "#!/bin/sh\n"; $script .= "# This is an auto generated file. \n"; - $script .= $cmd . ' 2> "' . $script_out . "\"\n"; + $script .= $cmd . ' 2>>"' . $script_out . '" >>"' . $script_out . "\"\n"; $script .= "exit $?\n"; } @@ -406,8 +403,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor $this->output = _kt('Could change permission on exec script: ') . $script_name; return false; } - $aRet = KTUtil::pexec($script_name); - $res = $aRet['ret']; + system($script_name, $res); } // remote the script file and get the output if available @@ -419,7 +415,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor @unlink($script_out); } - return $res == 0; + return ($res == 0) && empty($this->output); } /** diff --git a/search2/indexing/indexerCore.inc.php b/search2/indexing/indexerCore.inc.php index d70fee2..d8ba1b9 100644 --- a/search2/indexing/indexerCore.inc.php +++ b/search2/indexing/indexerCore.inc.php @@ -828,13 +828,13 @@ abstract class Indexer INNER JOIN mime_types mt ON dcv.mime_id=mt.id LEFT JOIN mime_extractors me ON mt.extractor_id=me.id WHERE - (iff.status_msg IS NOT NULL) AND dmv.status_id=1 + (iff.status_msg IS NOT NULL AND iff.status_msg <> '') AND d.status_id=1 ORDER BY indexdate "; } else { $sql = "SELECT - iff.document_id, iff.indexdate, mt.filetypes, mt.mimetypes, me.name as extractor, iff.what, iff.status_msg, dcv.filename + iff.document_id, iff.indexdate, mt.filetypes, mt.mimetypes, me.name as extractor, iff.what, iff.status_msg, dcv.filename FROM index_files iff INNER JOIN documents d ON iff.document_id=d.id @@ -843,7 +843,7 @@ abstract class Indexer INNER JOIN mime_types mt ON dcv.mime_id=mt.id LEFT JOIN mime_extractors me ON mt.extractor_id=me.id WHERE - (iff.status_msg IS NULL or iff.status_msg = '') AND dmv.status_id=1 + (iff.status_msg IS NULL or iff.status_msg = '') AND d.status_id=1 ORDER BY indexdate "; } $aResult = DBUtil::getResultArray($sql); @@ -1085,6 +1085,7 @@ abstract class Indexer { $extractor->setExtractionStatus(false); $this->logPendingDocumentInfoStatus($docId, sprintf(_kt("Could not extract contents from document %d"),$docId), 'error'); + $this->logPendingDocumentInfoStatus($docId, '' . $extractor->output . '', 'error'); } $this->executeHook($extractor, 'post_extract', $mimeType); diff --git a/templates/ktcore/search2/lucene_statistics.smarty b/templates/ktcore/search2/lucene_statistics.smarty index 525f5c5..e001fda 100644 --- a/templates/ktcore/search2/lucene_statistics.smarty +++ b/templates/ktcore/search2/lucene_statistics.smarty @@ -37,7 +37,15 @@ toggle.style.display = 'none'; {i18n}Period Since Last Indexing:{/i18n}{$stats.indexingPeriod} {i18n}Total # Documents in Repository:{/i18n}{$stats.docsInRepository} {i18n}Documents Indexed:{/i18n}{$stats.docsInIndex} -{i18n}Documents in Indexing Queue:{/i18n}{$stats.docsInQueue} + +{if $stats.docsInQueue > 0}{/if} +{i18n}Documents in Indexing Queue:{/i18n} +{if $stats.docsInQueue > 0}{/if} +{$stats.docsInQueue} +{if $stats.errorsInQueue > 0}{/if} + {i18n}Documents with Indexing Problems:{/i18n} + {if $stats.errorsInQueue > 0}{/if} + {$stats.errorsInQueue} {i18n}Index Coverage:{/i18n}