summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTom N Harris <tnharris@whoopdedo.org>2010-11-17 17:02:31 -0500
committerTom N Harris <tnharris@whoopdedo.org>2010-11-17 17:02:31 -0500
commit7c2ef4e8d524fb9262c5a08831220f9fb2dc11fe (patch)
tree675816d1de209d15d6131d8a2f7b43eca10e266f /bin
parent1c07b9e622d139fa815c955c89569f96342475fb (diff)
downloadrpg-7c2ef4e8d524fb9262c5a08831220f9fb2dc11fe.tar.gz
rpg-7c2ef4e8d524fb9262c5a08831220f9fb2dc11fe.tar.bz2
Use a different indexer version when external tokenizer is enabled
Diffstat (limited to 'bin')
-rwxr-xr-xbin/indexer.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/bin/indexer.php b/bin/indexer.php
index 48e98b571..497c6146a 100755
--- a/bin/indexer.php
+++ b/bin/indexer.php
@@ -13,10 +13,6 @@ require_once(DOKU_INC.'inc/auth.php');
require_once(DOKU_INC.'inc/cliopts.php');
session_write_close();
-// Version tag used to force rebuild on upgrade
-// Need to keep in sync with lib/exe/indexer.php
-if(!defined('INDEXER_VERSION')) define('INDEXER_VERSION', 2);
-
// handle options
$short_opts = 'hcuq';
$long_opts = array('help', 'clear', 'update', 'quiet');
@@ -88,7 +84,7 @@ function _index($id){
if(!$CLEAR){
$idxtag = metaFN($id,'.indexed');
if(@file_exists($idxtag)){
- if(io_readFile($idxtag) >= INDEXER_VERSION){
+ if(io_readFile($idxtag) == idx_get_version()){
$last = @filemtime(metaFN($id,'.indexed'));
if($last > @filemtime(wikiFN($id))) return;
}
@@ -98,7 +94,7 @@ function _index($id){
_lock();
_quietecho("$id... ");
idx_addPage($id);
- io_saveFile(metaFN($id,'.indexed'),INDEXER_VERSION);
+ io_saveFile(metaFN($id,'.indexed'), idx_get_version());
_quietecho("done.\n");
_unlock();
}