diff --git a/ecrire/action/instituer.php b/ecrire/action/instituer.php
index eef2858fbf74b12e506e9959be4bdb0066ef1c06..2ab80380f820d024b48395f3364a1aaa12e786a0 100644
--- a/ecrire/action/instituer.php
+++ b/ecrire/action/instituer.php
@@ -61,7 +61,7 @@ function instituer_forum($arg) {
// Signaler au moteur de recherche qu'il faut reindexer le thread
if ($id_parent) {
- include_ecrire('inc_index');
+ include_spip('inc/indexation');
marquer_indexer ('forum', $id_parent);
}
diff --git a/ecrire/exec/admin_vider.php b/ecrire/exec/admin_vider.php
index 92f0e51f4970f6ad298f017be6f114f17821b7ff..cc1fdeb5163aa7cd874a5dd6369c131aa8ba1626 100644
--- a/ecrire/exec/admin_vider.php
+++ b/ecrire/exec/admin_vider.php
@@ -53,7 +53,7 @@ if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) {
if ($purger_index == "oui") {
if (verifier_action_auteur("purger_index", $hash)) {
- include_ecrire('inc_index');
+ include_spip('inc/indexation');
purger_index();
creer_liste_indexation();
}
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 4e4a343ab4d7d344ff5cd5b541571f4abe62f332..d7b4ab2e40d9399e9aa4a457e7d98901a11b6d2a 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -515,7 +515,7 @@ function cron_articles($id_article, $statut, $statut_ancien)
if ($statut == 'publie') {
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('article', $id_article);
}
include_ecrire("inc_mail");
@@ -1064,7 +1064,7 @@ function rechercher_auteurs_articles($cherche_auteur, $id_article, $ajout_auteur
}
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('article', $id_article);
}
}
@@ -1074,7 +1074,7 @@ function rechercher_auteurs_articles($cherche_auteur, $id_article, $ajout_auteur
$query="DELETE FROM spip_auteurs_articles WHERE id_auteur='$supp_auteur' AND id_article='$id_article'";
$result=spip_query($query);
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('article', $id_article);
}
}
diff --git a/ecrire/exec/auteur_infos.php b/ecrire/exec/auteur_infos.php
index 9f79396bd674ab47945b6b3e27cacada7f8cbd2e..76c937d28c7cf6d7980fddee5fb868da4b1c0623 100644
--- a/ecrire/exec/auteur_infos.php
+++ b/ecrire/exec/auteur_infos.php
@@ -187,7 +187,7 @@ modifier_statut_auteur($auteur, $_POST['statut'], $_POST['id_parent'], $_GET['su
// Si on modifie la fiche auteur, reindexer et modifier htpasswd
if ($nom OR $statut) {
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('auteur', $id_auteur);
}
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index 162ad6fd61008098d3d0d29039397d02e32ff7dd..7abe0ff5e228763ae67eab7f2cb332401352162e 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -18,7 +18,7 @@ include_ecrire ("inc_logos");
include_ecrire ("inc_mots");
include_ecrire ("inc_date");
include_ecrire ("inc_abstract_sql");
-include_ecrire ("inc_index");
+include_spip("inc/indexation");
function afficher_breves_voir($id_breve, $changer_lang, $cherche_mot, $supp_mot, $nouv_mot )
{
@@ -280,7 +280,7 @@ if (strval($titre)!='' AND $modifier_breve) {
suivre_invalideur("id='id_breve/$id_breve'");
}
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('breve', $id_breve);
}
calculer_rubriques();
diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php
index c703de7cfaaa0de3d311a17239366742307a8379..b50d9dd1689aefb804ecdcf981894af551cb953f 100644
--- a/ecrire/exec/mots_edit.php
+++ b/ecrire/exec/mots_edit.php
@@ -90,7 +90,7 @@ if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
$result = spip_query($query);
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('mot', $id_mot);
}
}
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index a162134955e82ac4a8bfec220a0aa6025566390b..f1a74d4742c323e558cc3d02aec8f173166a279a 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -546,7 +546,7 @@ texte='" . addslashes($texte) . "'
$champs_extra
WHERE id_rubrique=$id_rubrique");
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('rubrique', $id_rubrique);
}
propager_les_secteurs();
diff --git a/ecrire/exec/recherche.php b/ecrire/exec/recherche.php
index 804245336214a916c19413167521d556c4eb105d..7ca17643ee2bb79853b7ab82588bed4811ec1eae 100644
--- a/ecrire/exec/recherche.php
+++ b/ecrire/exec/recherche.php
@@ -71,7 +71,7 @@ if (strlen($recherche) > 0) {
$activer_moteur = ($GLOBALS['meta']['activer_moteur'] == 'oui');
if ($activer_moteur) { // texte integral
- include_ecrire ('inc_index');
+ include_spip('inc/indexation');
list($hash_recherche,) = requete_hash ($recherche);
$query_articles_int = requete_txt_integral('spip_articles', $hash_recherche);
$query_breves_int = requete_txt_integral('spip_breves', $hash_recherche);
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index 335943d0833d39104e7bde447eb01f934559a926..79af92ba24ef1889ac0d75a49ac295318b627629 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -149,7 +149,7 @@ if ($nouveau_statut AND $flag_administrable) {
calculer_rubriques();
if ($statut == 'publie') {
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('syndic', $id_syndic);
}
}
@@ -195,7 +195,7 @@ if (strval($nom_site)!='' AND $modifier_site == 'oui' AND $flag_editable) {
suivre_invalideur("id='id_syndic/$id_syndic'");
}
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer('syndic', $id_syndic);
}
}
diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php
index 0a40a69787782edba7b3bea0026d75b2051922d6..a11035e29c4163e152c5a6db2109219542148fde 100644
--- a/ecrire/inc/documents.php
+++ b/ecrire/inc/documents.php
@@ -1417,7 +1417,7 @@ function maj_documents ($id_objet, $type) {
}
// Demander l'indexation du document
- include_ecrire('inc_index');
+ include_spip('inc/indexation');
marquer_indexer('document', $id_document);
}
diff --git a/ecrire/inc_index.php b/ecrire/inc/indexation.php
similarity index 99%
rename from ecrire/inc_index.php
rename to ecrire/inc/indexation.php
index 040785bc67ebba253a8117451c60c9d921ec3f3d..04ea3332e50641ad027a31b30206794b04ec5ba4 100644
--- a/ecrire/inc_index.php
+++ b/ecrire/inc/indexation.php
@@ -310,9 +310,7 @@ function indexer_contenu_document ($row) {
// Voir si on sait lire le contenu (eventuellement en chargeant le
// fichier extract/pdf.php dans find_in_path() )
- if ($plugin = find_in_path('extract/'.$extension, _DIR_INCLUDE)) {
- include_local($plugin);
- }
+ include_spip('extract/'.$extension);
if (function_exists($lire = $extracteur[$extension])) {
// Voir si on a deja une copie du doc distant
// Note: si copie_locale() charge le doc, elle demande une reindexation
diff --git a/ecrire/inc_config.php b/ecrire/inc_config.php
index 678e36626630868d8bfb6eba3620de1bc1df4658..f5579adfac3e9c97139934d82279ce010b0cb5a2 100644
--- a/ecrire/inc_config.php
+++ b/ecrire/inc_config.php
@@ -186,7 +186,7 @@ function appliquer_modifs_config() {
// Activer le moteur : dresser la liste des choses a indexer
if ($activer_moteur == 'oui' AND ($activer_moteur != $GLOBALS['meta']["activer_moteur"])) {
- include_ecrire('inc_index');
+ include_spip('inc/indexation');
creer_liste_indexation();
}
diff --git a/ecrire/inc_cron.php b/ecrire/inc_cron.php
index 26e9a56bee1ca53b61a0356cef61c9c48be6d5d0..3f29154eed9d95f8763db7276baca7991bced12e 100644
--- a/ecrire/inc_cron.php
+++ b/ecrire/inc_cron.php
@@ -156,7 +156,7 @@ function taches_generales() {
// indexation
if ($GLOBALS['meta']["activer_moteur"] == "oui")
- $taches_generales['index'] = 90;
+ $taches_generales['indexation'] = 90;
// ajax
$taches_generales['ajax'] = 3600 * 2;
@@ -177,11 +177,11 @@ function cron_optimiser($t) {
return 1;
}
-function cron_index($t) {
+function cron_indexation($t) {
$c = count(effectuer_une_indexation());
// si des indexations ont ete effectuees, on passe la periode a 0 s
## note : (time() - 90) correspond en fait a :
- ## time() - $taches_generales['index']
+ ## time() - $taches_generales['indexation']
if ($c)
return (0 - (time() - 90));
else
@@ -192,7 +192,7 @@ function cron_syndic($t) {
$r = executer_une_syndication();
if (($GLOBALS['meta']['activer_moteur'] == 'oui') &&
($GLOBALS['meta']["visiter_sites"] == 'oui')) {
- include_ecrire("inc_index");
+ include_spip("inc/indexation");
$r2 = executer_une_indexation_syndic();
$r = $r && $r2;
}
diff --git a/ecrire/inc_distant.php b/ecrire/inc_distant.php
index bbc2d4a8f35eaa9cdde811dc4085bb0031f3d1db..3890deae1a6f03e287b5e4b7637bf1f00f959b63 100644
--- a/ecrire/inc_distant.php
+++ b/ecrire/inc_distant.php
@@ -39,7 +39,7 @@ function copie_locale($source, $mode='auto') {
WHERE fichier='".addslashes($source)."'");
list($id_document) = spip_fetch_array($a);
if ($id_document) {
- include_ecrire('inc_index');
+ include_spip('inc/indexation');
marquer_indexer('document', $id_document);
}
}
diff --git a/ecrire/inc_getdocument.php b/ecrire/inc_getdocument.php
index 911fdfad302d375b0984092b24d117789337cc92..b63e14411329b74158a43f80e1317c44caa95169 100644
--- a/ecrire/inc_getdocument.php
+++ b/ecrire/inc_getdocument.php
@@ -372,7 +372,7 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode,
WHERE id_document = $id_document");
// Demander l'indexation du document
- include_ecrire('inc_index');
+ include_spip('inc/indexation');
marquer_indexer('document', $id_document);
return true;
diff --git a/ecrire/inc_majbase.php b/ecrire/inc_majbase.php
index d337ae1bf5618f850cd58acdc12ad68b4d123c7f..63204d083b006476dd8e3b974662dc9431cc7a2f 100644
--- a/ecrire/inc_majbase.php
+++ b/ecrire/inc_majbase.php
@@ -646,7 +646,7 @@ function maj_base() {
}
if ($version_installee < 1.600) {
- include_ecrire('inc_index');
+ include_spip('inc/indexation');
purger_index();
creer_liste_indexation();
maj_version (1.600);
diff --git a/ecrire/inc_mots.php b/ecrire/inc_mots.php
index 5fac512fb12a667e84d3c55f07525f96e64691d6..3655adc0f1ccc1cca0d57c3a3e32fb7954ee4c08 100644
--- a/ecrire/inc_mots.php
+++ b/ecrire/inc_mots.php
@@ -271,7 +271,7 @@ function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot,
if ($reindexer AND $GLOBALS['meta']['activer_moteur'] == 'oui') {
- include_ecrire ("inc_index");
+ include_spip("inc/indexation");
marquer_indexer($objet, $id_objet);
}
diff --git a/ecrire/inc_optimiser.php b/ecrire/inc_optimiser.php
index 37c180af3f76a1fbf2bc3e1f3fbbe94c3d7e965d..56ee74f9ede1ae660e23ea3c01c2c602ecfc49ae 100644
--- a/ecrire/inc_optimiser.php
+++ b/ecrire/inc_optimiser.php
@@ -12,7 +12,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
-include_ecrire('inc_index');
+include_spip('inc/indexation');
function optimiser_base() {
spip_log ("optimisation de la base");
diff --git a/ecrire/inc_ortho.php b/ecrire/inc_ortho.php
index fcaa2541de4ace4f12d93d286557688ec0e0afbf..d4dc7bcc46ff5ad9f9ea955f6430374c786e28b3 100644
--- a/ecrire/inc_ortho.php
+++ b/ecrire/inc_ortho.php
@@ -400,7 +400,7 @@ function afficher_ortho($texte) {
//
function corriger_ortho($texte, $lang, $charset = 'AUTO') {
include_ecrire("inc_charsets");
- include_ecrire("inc_index");
+ include_spip("inc/indexation");
include_ecrire("inc_filtres");
$texte = preg_replace(',<code>.*?</code>,is', '', $texte);
diff --git a/ecrire/public/calcul.php b/ecrire/public/calcul.php
index 9ae980ff136722550cde937747cff7902e60c59c..0e4323ee95241a7e2d0f7351c9d693a42485cb1b 100644
--- a/ecrire/public/calcul.php
+++ b/ecrire/public/calcul.php
@@ -19,7 +19,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
//
include_ecrire("inc_meta");
-include_ecrire("inc_index");
+include_spip("inc/indexation");
include_ecrire("inc_texte");
include_ecrire("inc_lang");
include_spip('inc/documents');