diff --git a/ecrire/action/ajouter.php b/ecrire/action/ajouter.php
index c2f5e147ae7c7c374745b67020c26795a701e51d..518f704f57266b174ed18ee5142de4afdbd099e4 100644
--- a/ecrire/action/ajouter.php
+++ b/ecrire/action/ajouter.php
@@ -59,7 +59,7 @@ function ajouter_auteur_et_rediriger($id_article, $id_auteur, $redirect)
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('article', $id_article);
+ marquer_indexer('spip_articles', $id_article);
}
if ($redirect) redirige_par_entete($redirect);
diff --git a/ecrire/action/documenter.php b/ecrire/action/documenter.php
index 2bbcb010c359030bf8bd1695a4d84fd192643333..cf0c90eb9a4d695a75197045b3fed37fe738fc5c 100644
--- a/ecrire/action/documenter.php
+++ b/ecrire/action/documenter.php
@@ -68,7 +68,7 @@ function action_documenter_dist() {
// Demander l'indexation du document
include_spip('inc/indexation');
- marquer_indexer('document', $id_document);
+ marquer_indexer('spip_documents', $id_document);
}
}
?>
diff --git a/ecrire/action/editer_article.php b/ecrire/action/editer_article.php
index 1e878cd511519473f4720202178c537c68e1043b..cc45a0b69cca7e313975a938fde993c22d61053a 100644
--- a/ecrire/action/editer_article.php
+++ b/ecrire/action/editer_article.php
@@ -175,7 +175,7 @@ function revisions_articles ($id_article, $id_rubrique, $new) {
// Demander une reindexation de l'article
if ($statut == 'publie') {
include_spip('inc/indexation');
- marquer_indexer('article', $id_article);
+ marquer_indexer('spip_articles', $id_article);
}
// Recalculer les rubriques (statuts et dates)
diff --git a/ecrire/action/editer_mot.php b/ecrire/action/editer_mot.php
index 34855472942bd6fbdd02637631d7718720aa2739..1440f2fbd4510bb2aa50270b83637333dc5e158e 100644
--- a/ecrire/action/editer_mot.php
+++ b/ecrire/action/editer_mot.php
@@ -51,9 +51,9 @@ spip_log("$id_mot, $id_objet, $table, $table_id, $objet");
spip_query("INSERT INTO spip_mots_$table (id_mot,$table_id) VALUES ($nouv_mot, $id_objet)");
}
- if ($objet AND $GLOBALS['meta']['activer_moteur'] == 'oui') {
+ if ($table AND $GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer($objet, $id_objet);
+ marquer_indexer("spip_$table", $id_objet);
}
}
diff --git a/ecrire/action/instituer_article.php b/ecrire/action/instituer_article.php
index 0c60a74f2a5b81b343d69f4533bf052f795ccce2..046a25479e2272cb1c7d8aed5bd9ebe0964c6788 100644
--- a/ecrire/action/instituer_article.php
+++ b/ecrire/action/instituer_article.php
@@ -41,7 +41,7 @@ function action_instituer_article_dist() {
if ($statut == 'publie') {
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('article', $id_article);
+ marquer_indexer('spip_articles', $id_article);
}
include_spip('inc/lang');
include_spip('inc/texte');
diff --git a/ecrire/action/instituer_forum.php b/ecrire/action/instituer_forum.php
index bc3e2fbd64423351ad09c00531d7a5957c8bf34b..56a138681c154c1cb741539dac8f8a8161279979 100644
--- a/ecrire/action/instituer_forum.php
+++ b/ecrire/action/instituer_forum.php
@@ -38,7 +38,7 @@ function action_instituer_forum_dist() {
// Signaler au moteur de recherche qu'il faut reindexer le thread
if ($id_parent) {
include_spip('inc/indexation');
- marquer_indexer ('forum', $id_parent);
+ marquer_indexer ('spip_forum', $id_parent);
}
// changer le statut de toute l'arborescence dependant de ce message
diff --git a/ecrire/action/supprimer.php b/ecrire/action/supprimer.php
index 3f1a532080a2981f948555178ba663088986e543..0c0930552a8c860135f6e25492a57c531d7c59aa 100644
--- a/ecrire/action/supprimer.php
+++ b/ecrire/action/supprimer.php
@@ -102,7 +102,7 @@ function action_supprimer_auteur_article($arg)
spip_query("DELETE FROM spip_auteurs_articles WHERE id_auteur=".$r[1]." AND id_article=" . $r[2]);
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('article', $r[2]);
+ marquer_indexer('spip_articles', $r[2]);
}
}
else spip_log("action_supprimer_auteur_article $arg pas compris");
diff --git a/ecrire/exec/auteur_infos.php b/ecrire/exec/auteur_infos.php
index b3aafa97bf006eefad5f8f2b77bb79026459129c..fdd8ae3a0de64e63972bd8d9ad58457abfd23be5 100644
--- a/ecrire/exec/auteur_infos.php
+++ b/ecrire/exec/auteur_infos.php
@@ -177,7 +177,7 @@ modifier_statut_auteur($auteur, $_POST['statut'], $_POST['id_parent']);
if ($nom OR $statut) {
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('auteur', $id_auteur);
+ marquer_indexer('spip_auteurs', $id_auteur);
}
// Mettre a jour les fichiers .htpasswd et .htpasswd-admin
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index 2ab58ffebaa0d56c4e7b78e325dcaaee19579e39..510acefbbf400b9786ab21c72c443ebf9eb9af30 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -278,7 +278,7 @@ if (($id_breve == 0) AND ($new == "oui")) {
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('breve', $id_breve);
+ marquer_indexer('spip_breves', $id_breve);
}
$calculer_rubriques = true;
diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php
index 700cdefaa5d2e66fcddfa0d5603b67887f26b7ce..91a212c909735072e8c86fda002931c51445d9f3 100644
--- a/ecrire/exec/mots_edit.php
+++ b/ecrire/exec/mots_edit.php
@@ -73,7 +73,7 @@ global
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('mot', $id_mot);
+ marquer_indexer('spip_mots', $id_mot);
}
}
else if ($new == 'oui') {
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index 204be4baf296f5e7b2eca585e8b3b6318de9bd50..ac6404527ebef1301770a745c9e4e50caaf60a0a 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -511,7 +511,7 @@ function enregistre_modifier_naviguer($id_rubrique, $id_parent, $titre, $texte,
spip_query("UPDATE spip_rubriques SET " . (acces_rubrique($id_parent) ? "id_parent=$id_parent," : "") . "titre=" . spip_abstract_quote($titre) . ", descriptif=" . spip_abstract_quote($descriptif) . ", texte=" . spip_abstract_quote($texte) . (!$extra ? '' : ", extra = " . spip_abstract_quote($extra) . "") . "WHERE id_rubrique=$id_rubrique");
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('rubrique', $id_rubrique);
+ marquer_indexer('spip_rubriques', $id_rubrique);
}
propager_les_secteurs();
}
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index 916096f251f35f1bf688742cc1a06f526faa638f..ee3f12b49045844d9af459099d5b2c3e4501cd82 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -123,7 +123,7 @@ if ($nouveau_statut AND $flag_administrable) {
if ($statut == 'publie') {
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('syndic', $id_syndic);
+ marquer_indexer('spip_syndic', $id_syndic);
}
}
}
@@ -159,7 +159,7 @@ if (strval($nom_site)!='' AND $modifier_site == 'oui' AND $flag_editable) {
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
- marquer_indexer('syndic', $id_syndic);
+ marquer_indexer('spip_syndic', $id_syndic);
}
}
}
diff --git a/ecrire/inc/distant.php b/ecrire/inc/distant.php
index 0dc603dc74de2b7079679b7c7513176824bf39ec..0b5e5bfefa0b090c736acd6272ba54a6c8079a12 100644
--- a/ecrire/inc/distant.php
+++ b/ecrire/inc/distant.php
@@ -49,7 +49,7 @@ function copie_locale($source, $mode='auto') {
$id_document = $id_document['id_document'];
if ($id_document) {
include_spip('inc/indexation');
- marquer_indexer('document', $id_document);
+ marquer_indexer('spip_documents', $id_document);
}
}
else
diff --git a/ecrire/inc/getdocument.php b/ecrire/inc/getdocument.php
index 4214b8f016f193bd01d16c258615056ff1ebfca9..b41327fa566505acb28e661163533898eb391ad7 100644
--- a/ecrire/inc/getdocument.php
+++ b/ecrire/inc/getdocument.php
@@ -422,7 +422,7 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode,
// Demander l'indexation du document
include_spip('inc/indexation');
- marquer_indexer('document', $id_document);
+ marquer_indexer('spip_documents', $id_document);
return true;
}
diff --git a/ecrire/inc/indexation.php b/ecrire/inc/indexation.php
index c6c6188e2429b25818d78c441dc014c0b2221ba5..e7d3dfc2d2db438792b3bdbc64414cbdc1396d66 100644
--- a/ecrire/inc/indexation.php
+++ b/ecrire/inc/indexation.php
@@ -598,19 +598,18 @@ function indexer_objet($table, $id_objet, $forcer_reset = true) {
'non' ne jamais indexer
*/
-// API pour l'espace prive
+// API pour l'espace prive pour marquer un objet d'une table a reindexer
// http://doc.spip.org/@marquer_indexer
-function marquer_indexer ($objet, $id_objet) {
- spip_log ("demande indexation $objet $id_objet");
- $table = 'spip_'.table_objet($objet);
- $id = id_table_objet($objet);
+function marquer_indexer ($table, $id_objet) {
+ spip_log ("demande indexation $table id=$id_objet");
+ $id = primary_index_tables($table);
spip_query("UPDATE $table SET idx='1' WHERE $id=$id_objet AND idx!='non'");
}
// A garder pour compatibilite bouton memo...
// http://doc.spip.org/@indexer_article
function indexer_article($id_article) {
- marquer_indexer('article', $id_article);
+ marquer_indexer('spip_articles', $id_article);
}
// n'indexer que les objets publies
@@ -671,7 +670,7 @@ function executer_une_indexation_syndic() {
if ($row) {
$id_syndic = $row['id_syndic'];
spip_query("UPDATE spip_syndic SET date_index=NOW() WHERE id_syndic=$id_syndic");
- marquer_indexer('syndic', $id_syndic);
+ marquer_indexer('spip_syndic', $id_syndic);
}
return $id_syndic;
}