diff options
| author | Tom N Harris <tnharris@whoopdedo.org> | 2010-11-17 17:02:31 -0500 |
|---|---|---|
| committer | Tom N Harris <tnharris@whoopdedo.org> | 2010-11-17 17:02:31 -0500 |
| commit | 7c2ef4e8d524fb9262c5a08831220f9fb2dc11fe (patch) | |
| tree | 675816d1de209d15d6131d8a2f7b43eca10e266f /lib | |
| parent | 1c07b9e622d139fa815c955c89569f96342475fb (diff) | |
| download | rpg-7c2ef4e8d524fb9262c5a08831220f9fb2dc11fe.tar.gz rpg-7c2ef4e8d524fb9262c5a08831220f9fb2dc11fe.tar.bz2 | |
Use a different indexer version when external tokenizer is enabled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/exe/indexer.php | 7 | ||||
| -rw-r--r-- | lib/exe/xmlrpc.php | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 4a6f74ba4..55d860296 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', 2); - // keep running after browser closes connection @ignore_user_abort(true); @@ -140,7 +137,7 @@ function runIndexer(){ // check if indexing needed $idxtag = metaFN($ID,'.indexed'); if(@file_exists($idxtag)){ - if(trim(io_readFile($idxtag)) == INDEXER_VERSION){ + if(trim(io_readFile($idxtag)) == idx_get_version()){ $last = @filemtime($idxtag); if($last > @filemtime(wikiFN($ID))){ print "runIndexer(): index for $ID up to date".NL; @@ -168,7 +165,7 @@ function runIndexer(){ idx_addPage($ID); // we're finished - save and free lock - io_saveFile(metaFN($ID,'.indexed'),INDEXER_VERSION); + io_saveFile(metaFN($ID,'.indexed'), idx_get_version()); @rmdir($lock); print "runIndexer(): finished".NL; return true; diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index f06792361..410d4f6ba 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -1,7 +1,7 @@ <?php if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); -// fix when '<?xml' isn't on the very first line +// fix when '< ?xml' isn't on the very first line if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); /** @@ -570,7 +570,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { idx_addPage($id); // we're finished - save and free lock - io_saveFile(metaFN($id,'.indexed'),INDEXER_VERSION); + io_saveFile(metaFN($id,'.indexed'), idx_get_version()); @rmdir($lock); } |