Merge lp:~yoboy-leguesh/ubuntu-fr-doc/patch-index into lp:ubuntu-fr-doc

[YoBoY]

Correctif permettant de nettoyer les index quand une page est supprimée
(comportement attendu mais en défaut)
Nécessite une ré-indexation complète.

=== modified file 'inc/indexer.php'
--- inc/indexer.php	2012-01-29 10:04:35 +0000
+++ inc/indexer.php	2012-03-16 07:44:18 +0000
@@ -351,7 +351,7 @@
             return "locked";
 
         // load known documents
-        $pid = $this->getIndexKey('page', '', $page);
+        $pid = $this->addIndexKey('page', '', $page);
         if ($pid === false) {
             $this->unlock();
             return false;
@@ -389,6 +389,7 @@
             $val_idx = explode(':', $this->getIndexKey($metaname.'_p', '', $pid));
             $meta_idx = $this->getIndex($metaname.'_i', '');
             foreach ($val_idx as $id) {
+                if ($id === '') continue;
                 $meta_idx[$id] = $this->updateTuple($meta_idx[$id], $pid, 0);
             }
             $this->saveIndex($metaname.'_i', '', $meta_idx);
@@ -1174,18 +1175,8 @@
  * @author Tom N Harris <[e-mail]>
  */
 function idx_addPage($page, $verbose=false, $force=false) {
-    // check if indexing needed
     $idxtag = metaFN($page,'.indexed');
-    if(!$force && @file_exists($idxtag)){
-        if(trim(io_readFile($idxtag)) == idx_get_version()){
-            $last = @filemtime($idxtag);
-            if($last > @filemtime(wikiFN($page))){
-                if ($verbose) print("Indexer: index for $page up to date".DOKU_LF);
-                return false;
-            }
-        }
-    }
-
+    // check if page was deleted but is still in the index
     if (!page_exists($page)) {
         if (!@file_exists($idxtag)) {
             if ($verbose) print("Indexer: $page does not exist, ignoring".DOKU_LF);
@@ -1200,6 +1191,19 @@
         @unlink($idxtag);
         return $result;
     }
+
+    // check if indexing needed
+    if(!$force && @file_exists($idxtag)){
+        if(trim(io_readFile($idxtag)) == idx_get_version()){
+            $last = @filemtime($idxtag);
+            if($last > @filemtime(wikiFN($page))){
+                if ($verbose) print("Indexer: index for $page up to date".DOKU_LF);
+                return false;
+            }
+        }
+    }
+
+
     $indexenabled = p_get_metadata($page, 'internal index', METADATA_RENDER_UNLIMITED);
     if ($indexenabled === false) {
         $result = false;

=== modified file 'inc/template.php'
--- inc/template.php	2012-01-29 10:23:34 +0000
+++ inc/template.php	2012-03-16 07:44:18 +0000
@@ -990,8 +990,6 @@
  */
 function tpl_indexerWebBug(){
     global $ID;
-    global $INFO;
-    if(!$INFO['exists']) return false;
 
     $p = array();
     $p['src']    = DOKU_BASE.'lib/exe/indexer.php?id='.rawurlencode($ID).