mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-06 15:14:58 +00:00
index folders in task
This commit is contained in:
parent
3827cdda27
commit
363f417eb7
|
@ -124,17 +124,64 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
|
|||
public function __construct($fulltextservice, $forceupdate) { /* {{{ */
|
||||
$this->fulltextservice = $fulltextservice;
|
||||
$this->forceupdate = $forceupdate;
|
||||
$this->numdocs = $this->fulltextservice->Indexer()->count();
|
||||
} /* }}} */
|
||||
|
||||
public function process($folder) { /* {{{ */
|
||||
public function process($folder, $depth=0) { /* {{{ */
|
||||
$lucenesearch = $this->fulltextservice->Search();
|
||||
$documents = $folder->getDocuments();
|
||||
echo str_repeat(' ', $depth+1).$folder->getId().":".$folder->getFolderPathPlain()." ";
|
||||
if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
|
||||
try {
|
||||
$idoc = $this->fulltextservice->IndexedDocument($folder, true);
|
||||
if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
|
||||
foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
|
||||
if (method_exists($hookObj, 'preIndexFolder')) {
|
||||
$hookObj->preIndexDocument(null, $folder, $idoc);
|
||||
}
|
||||
}
|
||||
}
|
||||
$this->fulltextservice->Indexer()->addDocument($idoc);
|
||||
echo "(".getMLText('index_folder_added').")".PHP_EOL;
|
||||
} catch(Exception $e) {
|
||||
echo "(Timeout)".PHP_EOL;
|
||||
}
|
||||
} else {
|
||||
/* Check if the attribute created is set or has a value older
|
||||
* than the lastet content. Folders without such an attribute
|
||||
* where added when a new folder was added to the dms. In such
|
||||
* a case the folder content wasn't indexed.
|
||||
*/
|
||||
try {
|
||||
$created = (int) $hit->getDocument()->getFieldValue('created');
|
||||
} catch (/* Zend_Search_Lucene_ */Exception $e) {
|
||||
$created = 0;
|
||||
}
|
||||
if($created >= $folder->getDate() && !$this->forceupdate) {
|
||||
echo "(".getMLText('index_folder_unchanged').")".PHP_EOL;
|
||||
} else {
|
||||
$this->fulltextservice->Indexer()->delete($hit->id);
|
||||
try {
|
||||
$idoc = $this->fulltextservice->IndexedDocument($folder, true);
|
||||
if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
|
||||
foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
|
||||
if (method_exists($hookObj, 'preIndexFolder')) {
|
||||
$hookObj->preIndexDocument(null, $folder, $idoc);
|
||||
}
|
||||
}
|
||||
}
|
||||
$this->fulltextservice->Indexer()->addDocument($idoc);
|
||||
echo "(".getMLText('index_folder_updated').")".PHP_EOL;
|
||||
} catch(Exception $e) {
|
||||
echo "(Timeout)".PHP_EOL;
|
||||
}
|
||||
}
|
||||
}
|
||||
if($documents) {
|
||||
$lucenesearch = $this->fulltextservice->Search();
|
||||
echo $folder->getFolderPathPlain().PHP_EOL;
|
||||
foreach($documents as $document) {
|
||||
echo $document->getId().":".$document->getName()." ";
|
||||
echo str_repeat(' ', $depth+2).$document->getId().":".$document->getName()." ";
|
||||
/* If the document wasn't indexed before then just add it */
|
||||
if(!($hit = $lucenesearch->getDocument($document->getId()))) {
|
||||
if(($this->numdocs == 0) || !($hit = $lucenesearch->getDocument($document->getId()))) {
|
||||
try {
|
||||
$idoc = $this->fulltextservice->IndexedDocument($document, true);
|
||||
if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
|
||||
|
@ -227,8 +274,8 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
|
|||
}
|
||||
|
||||
$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($fulltextservice, $recreate);
|
||||
call_user_func(array($folderprocess, 'process'), $folder, -1);
|
||||
$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
|
||||
call_user_func(array($folderprocess, 'process'), $folder);
|
||||
} else {
|
||||
$logger->log('Task \'indexingdocs\': fulltext search is turned off', PEAR_LOG_WARNING);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user