From 3ce119144aa408d2a86f5f1379b4a0309dbf15df Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 25 Aug 2006 16:05:56 +0000
Subject: [PATCH] =?UTF-8?q?marquer=5Findexer=20prend=20la=20table=20en=20e?=
=?UTF-8?q?ntree=20et=20non=20plus=20l'objet=20pour=20plus=20de=20generici?=
=?UTF-8?q?t=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/action/ajouter.php | 2 +-
ecrire/action/documenter.php | 2 +-
ecrire/action/editer_article.php | 2 +-
ecrire/action/editer_mot.php | 4 ++--
ecrire/action/instituer_article.php | 2 +-
ecrire/action/instituer_forum.php | 2 +-
ecrire/action/supprimer.php | 2 +-
ecrire/exec/auteur_infos.php | 2 +-
ecrire/exec/breves_voir.php | 2 +-
ecrire/exec/mots_edit.php | 2 +-
ecrire/exec/naviguer.php | 2 +-
ecrire/exec/sites.php | 4 ++--
ecrire/inc/distant.php | 2 +-
ecrire/inc/getdocument.php | 2 +-
ecrire/inc/indexation.php | 13 ++++++-------
15 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/ecrire/action/ajouter.php b/ecrire/action/ajouter.php
index c2f5e147ae..518f704f57 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 2bbcb010c3..cf0c90eb9a 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 1e878cd511..cc45a0b69c 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 3485547294..1440f2fbd4 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 0c60a74f2a..046a25479e 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 bc3e2fbd64..56a138681c 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 3f1a532080..0c0930552a 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 b3aafa97bf..fdd8ae3a0d 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 2ab58ffeba..510acefbbf 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 700cdefaa5..91a212c909 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 204be4baf2..ac6404527e 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 916096f251..ee3f12b490 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 0dc603dc74..0b5e5bfefa 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 4214b8f016..b41327fa56 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 c6c6188e24..e7d3dfc2d2 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;
}
--
GitLab