diff options
author | Michael Hamann <michael@content-space.de> | 2011-03-08 00:33:35 +0100 |
---|---|---|
committer | Michael Hamann <michael@content-space.de> | 2011-03-08 00:33:35 +0100 |
commit | d8e733eea8ac79670ffc74ac685078dc4ac56c7e (patch) | |
tree | b036d19bd256fc3a1016ef9a1697a894dfd2b5f3 /lib/exe/indexer.php | |
parent | dea1115b59e771c401882590426074c08fed3a87 (diff) | |
parent | ad79cb7c93a655f864c633433e743b03685b5719 (diff) | |
download | rpg-d8e733eea8ac79670ffc74ac685078dc4ac56c7e.tar.gz rpg-d8e733eea8ac79670ffc74ac685078dc4ac56c7e.tar.bz2 |
Merge branch 'indexer_rewrite'
Diffstat (limited to 'lib/exe/indexer.php')
-rw-r--r-- | lib/exe/indexer.php | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 0042e92d2..95e2af05b 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -11,9 +11,6 @@ require_once(DOKU_INC.'inc/init.php'); session_write_close(); //close session if(!defined('NL')) define('NL',"\n"); -// Version tag used to force rebuild on upgrade -define('INDEXER_VERSION', 3); - // keep running after browser closes connection @ignore_user_abort(true); @@ -136,47 +133,8 @@ function runIndexer(){ if(!$ID) return false; - // check if indexing needed - $idxtag = metaFN($ID,'.indexed'); - if(@file_exists($idxtag)){ - if(io_readFile($idxtag) >= INDEXER_VERSION){ - $last = @filemtime($idxtag); - if($last > @filemtime(wikiFN($ID))){ - print "runIndexer(): index for $ID up to date".NL; - return false; - } - } - } - - // try to aquire a lock - $run = 0; - $lock = $conf['lockdir'].'/_indexer.lock'; - while(!@mkdir($lock,$conf['dmode'])){ - usleep(50); - if(is_dir($lock) && time()-@filemtime($lock) > 60*5){ - // looks like a stale lock - remove it - if (!@rmdir($lock)) { - print "runIndexer(): removing the stale lock failed".NL; - return false; - } else { - print "runIndexer(): stale lock removed".NL; - } - }elseif($run++ == 1000){ - // we waited 5 seconds for that lock - print "runIndexer(): indexer locked".NL; - return false; - } - } - if($conf['dperm']) chmod($lock, $conf['dperm']); - // do the work - idx_addPage($ID); - - // we're finished - save and free lock - io_saveFile(metaFN($ID,'.indexed'),INDEXER_VERSION); - @rmdir($lock); - print "runIndexer(): finished".NL; - return true; + return idx_addPage($ID, true); } /** |