opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Adjust bin/indexer.php for the new indexer 

Now the indexer is directly called instead of duplicating a large part
of the indexer code.
This commit is contained in:
Michael Hamann 2011-03-06 14:48:58 +01:00
parent 39d6fd3051
commit ad79cb7c93
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bin/indexer.php
View File

@ -87,41 +87,15 @@ function _index($id){
global $QUIET;
// if not cleared only update changed and new files
if(!$CLEAR){
if($CLEAR){
$idxtag = metaFN($id,'.indexed');
if(@file_exists($idxtag)){
if(io_readFile($idxtag) == idx_get_version()){
$last = @filemtime($idxtag);
if($last > @filemtime(wikiFN($id))) return;
}
@unlink($idxtag);
}
}
_quietecho("$id... ");
$body = '';
$data = array($id, $body);
$evt = new Doku_Event('INDEXER_PAGE_ADD', $data);
if ($evt->advise_before()) $data[1] = $data[1] . " " . rawWiki($id);
$evt->advise_after();
unset($evt);
list($id,$body) = $data;
$said = false;
while(true) {
$result = $INDEXER->addPageWords($id, $body);
if ($result == "locked") {
if($said){
_quietecho(".");
}else{
_quietecho("Waiting for lockfile (max. 5 min)");
$said = true;
}
sleep(15);
} else {
break;
}
}
if ($result)
io_saveFile(metaFN($id,'.indexed'), idx_get_version());
idx_addPage($id, !$QUIET);
_quietecho("done.\n");
}