diff options
author | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
---|---|---|
committer | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
commit | 16a774a8a61756df2d8fb813bfbaed98b42e3e65 (patch) | |
tree | 3a48d311e74ccbf4017330cef8af00003b0ddb34 /bin | |
parent | 662a7b3fcc22d8327026bc1ef161a096683f1580 (diff) | |
parent | a5a71ecfcc1ed6bfca1995b39cd0abe4b8dd9eeb (diff) | |
download | rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.gz rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.bz2 |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/indexer.php | 7 | ||||
-rw-r--r-- | bin/striplangs.php | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bin/indexer.php b/bin/indexer.php index 4bfd1682e..f6aeb4f0e 100755 --- a/bin/indexer.php +++ b/bin/indexer.php @@ -133,12 +133,15 @@ function _clearindex(){ _lock(); _quietecho("Clearing index... "); io_saveFile($conf['indexdir'].'/page.idx',''); - //io_saveFile($conf['indexdir'].'/title.idx',''); + io_saveFile($conf['indexdir'].'/title.idx',''); + io_saveFile($conf['indexdir'].'/pageword.idx',''); + io_saveFile($conf['indexdir'].'/metadata.idx',''); $dir = @opendir($conf['indexdir']); if($dir!==false){ while(($f = readdir($dir)) !== false){ if(substr($f,-4)=='.idx' && - (substr($f,0,1)=='i' || substr($f,0,1)=='w')) + (substr($f,0,1)=='i' || substr($f,0,1)=='w' + || substr($f,-6)=='_w.idx' || substr($f,-6)=='_i.idx' || substr($f,-6)=='_p.idx')) @unlink($conf['indexdir']."/$f"); } } diff --git a/bin/striplangs.php b/bin/striplangs.php index 288859c6a..40cef5063 100644 --- a/bin/striplangs.php +++ b/bin/striplangs.php @@ -22,7 +22,7 @@ function usage($show_examples = false) { -h, --help get this help -x, --examples get also usage examples -k, --keep comma separated list of languages, -e is always implied - -e, --english keeps english, dummy to use without -k"; + -e, --english keeps english, dummy to use without -k\n"; if ( $show_examples ) { print "\n EXAMPLES |