gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check if IndexedDocument() set error msg, call right hook after indexing document

Browse Source
This commit is contained in:
Uwe Steinmann 2022-05-30 13:07:30 +02:00
parent c52abe7198
commit 6d5d1a7703
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/inc.Tasks.php
View File

@ -139,6 +139,8 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) { if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
try { try {
$idoc = $this->fulltextservice->IndexedDocument($folder, true); $idoc = $this->fulltextservice->IndexedDocument($folder, true);
$error = $idoc->getErrorMsg();
if(!$error) {
if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) { if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) { foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
if (method_exists($hookObj, 'preIndexFolder')) { if (method_exists($hookObj, 'preIndexFolder')) {
@ -148,6 +150,9 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
} }
$this->fulltextservice->Indexer()->addDocument($idoc); $this->fulltextservice->Indexer()->addDocument($idoc);
echo "(".getMLText('index_folder_added').")".PHP_EOL; echo "(".getMLText('index_folder_added').")".PHP_EOL;
} else {
echo "(".$error.")".PHP_EOL;
}
} catch(Exception $e) { } catch(Exception $e) {
echo "(Timeout)".PHP_EOL; echo "(Timeout)".PHP_EOL;
} }
@ -168,15 +173,20 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
$this->fulltextservice->Indexer()->delete($hit->id); $this->fulltextservice->Indexer()->delete($hit->id);
try { try {
$idoc = $this->fulltextservice->IndexedDocument($folder, true); $idoc = $this->fulltextservice->IndexedDocument($folder, true);
if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) { $error = $idoc->getErrorMsg();
foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) { if(!$error) {
if (method_exists($hookObj, 'preIndexFolder')) { if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
if (method_exists($hookObj, 'preIndexDocument')) {
$hookObj->preIndexDocument(null, $folder, $idoc); $hookObj->preIndexDocument(null, $folder, $idoc);
} }
} }
} }
$this->fulltextservice->Indexer()->addDocument($idoc); $this->fulltextservice->Indexer()->addDocument($idoc);
echo "(".getMLText('index_folder_updated').")".PHP_EOL; echo "(".getMLText('index_folder_updated').")".PHP_EOL;
} else {
echo "(".$error.")".PHP_EOL;
}
} catch(Exception $e) { } catch(Exception $e) {
echo "(Timeout)".PHP_EOL; echo "(Timeout)".PHP_EOL;
} }