Author: bill@adequates.com
Date: Fri Jul 28 15:07:02 2006
New Revision: 4243
Log:
Ca commence a marcher ...
Added:
_plugins_/_contenu_editorial_/spipcarto/spipcarto/
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_demo.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_fond.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_geosvgwms.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_geosvgwmsfile.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_lien.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_logo.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_map.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_style.css
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_svg.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_svgfile.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_svgfilex.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_svgx.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_symbol.xml
_plugins_/_contenu_editorial_/spipcarto/style_prive.html
Removed:
_plugins_/_contenu_editorial_/spipcarto/action/
Modified:
_plugins_/_contenu_editorial_/spipcarto/TODO.txt
_plugins_/_contenu_editorial_/spipcarto/exec/cartes.php
_plugins_/_contenu_editorial_/spipcarto/exec/cartes_edit.php
_plugins_/_contenu_editorial_/spipcarto/exec/config_spipcarto.php
_plugins_/_contenu_editorial_/spipcarto/inc/carto.php
_plugins_/_contenu_editorial_/spipcarto/lang/spipcarto_fr.php
_plugins_/_contenu_editorial_/spipcarto/spipcarto.php
_plugins_/_contenu_editorial_/spipcarto/spipcarto_fonctions.php
Modified: _plugins_/_contenu_editorial_/spipcarto/TODO.txt
--- _plugins_/_contenu_editorial_/spipcarto/TODO.txt (original)
+++ _plugins_/_contenu_editorial_/spipcarto/TODO.txt Fri Jul 28 15:07:02 2006
@@ -0,0 +1 @@
+Faire marcher le plugin !
\ No newline at end of file
Modified: _plugins_/_contenu_editorial_/spipcarto/exec/cartes.php
--- _plugins_/_contenu_editorial_/spipcarto/exec/cartes.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/exec/cartes.php Fri Jul 28 15:07:02 2006
@@ -66,10 +66,12 @@
//TODO !!!
afficher_cartes(_T("spipcarto:cartes_toutes"),
- "SELECT cartes.*, COUNT(id_carto_objet) AS objets ".
- "FROM spip_carto_cartes AS cartes LEFT JOIN spip_carto_objets AS objets ".
- "ON (cartes.id_carto_carte=objets.id_carto_carte) ".
- "GROUP BY cartes.id_carto_carte ORDER BY cartes.titre");
+ array(
+ "SELECT"=>"cartes.*, COUNT(id_carto_objet) AS objets ",
+ "FROM"=>"spip_carto_cartes AS cartes" ,
+ "JOIN"=>"spip_carto_objets AS objets ON (cartes.id_carto_carte=objets.id_carto_carte) ",
+ "GROUP BY"=>"cartes.id_carto_carte",
+ "ORDER BY"=>"cartes.titre"));
//TODO : gerer un statut par objet
//ajouter cette clause à la jointure :
//// AND objets.statut='valide'
Modified: _plugins_/_contenu_editorial_/spipcarto/exec/cartes_edit.php
--- _plugins_/_contenu_editorial_/spipcarto/exec/cartes_edit.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/exec/cartes_edit.php Fri Jul 28 15:07:02 2006
@@ -49,7 +49,7 @@
function exec_cartes_edit() {
include(_DIR_PLUGIN_SPIPCARTO."/inc/carto.php");
//include_spip ("inc/carto");
-include_spip ("spipcarto_mes_fonctions");
+include_spip ("spipcarto_fonctions");
include_spip ("inc/carto_import");
include_spip ("inc/presentation");
include_spip ("inc/documents");
@@ -76,7 +76,7 @@
$modif_carte=stripslashes($_REQUEST['modif_carte']);
$selection_type=stripslashes($_REQUEST['selection_type']);
-$selection_coord=stripslashes($_REQUEST['selection_coord']);
+$selection_coords=stripslashes($_REQUEST['selection_coords']);
$modif_objet=stripslashes($_REQUEST['modif_objet']);
$objet_titre=stripslashes($_REQUEST['objet_titre']);
$objet_texte=stripslashes($_REQUEST['objet_texte']);
@@ -145,6 +145,21 @@
+//$flag_mots = "oui";
+if ($id_carte) {
+ //TODO : passer tout ca en spip_abstract ...
+ $query = "SELECT * FROM spip_carto_cartes WHERE id_carto_carte=$id_carte";
+ $result = spip_query($query);
+ if ($row = spip_fetch_array($result)) {
+ $titre = entites_html($row['titre']);
+ $url_carte = $row['url_carte'];
+ $texte = entites_html($row['texte']);
+ $callage = entites_html($row['callage']);
+ $id_srs = intval($row['id_srs']);
+ $js_titre = "";
+ }
+ }
+
//
// Modifications des objets de la carte
//
@@ -195,21 +210,6 @@
}
-//$flag_mots = "oui";
-if ($id_carte) {
- //TODO : passer tout ca en spip_abstract ...
- $query = "SELECT * FROM spip_carto_cartes WHERE id_carto_carte=$id_carte";
- $result = spip_query($query);
- if ($row = spip_fetch_array($result)) {
- $titre = entites_html($row['titre']);
- $url_carte = $row['url_carte'];
- $texte = entites_html($row['texte']);
- $callage = entites_html($row['callage']);
- $id_srs = intval($row['id_srs']);
- $js_titre = "";
- }
- }
-
$param="id_carte=".$id_carte;
if ($retour) $param.='&retour='.$retour;
@@ -310,10 +310,14 @@
//TODO : gerer zoom et position
//if (intval($url_carte)>0) $leurl_carte="../spip_carto.php?fond_carte=".intval($url_carte);
//else $leurl_carte=$url_carte;
- $lurl_carte="../spip_carto.php?fond_carte=".urlencode($url_carte);
+ $lurl_carte="../spip_carto.php?fond_carte=".base64_encode($url_carte);
$tabcallage=worldfile2array($callage);
-
+// echo"<div style=\"position:relative\">";
+// echo"<div style=\"position:absolute\">";
echo afficher_carte_interface($id_carte,$retour,$lurl_carte,$tabcallage, $url_carte);
+// echo"<hr/>aaa";
+// echo"</div>";
+// echo"</div>";
echo fin_block();
//echo "</div>\n";
@@ -460,7 +464,7 @@
echo "<form method='post' action='".generer_url_ecrire("cartes_edit","#objet_visible")."'>";
echo '<input type="hidden" name="id_carte" value="'.$id_carte.'">';
- $mlink='supp_objet='.$id_objet;
+ $mlink='supp_objet='.$id_objet.'&id_carte='.$id_carte;
if ($retour) {
$mlink.='&retour='.$retour;
echo '<input type="hidden" name="retour" value="'.$retour.'">';
Modified: _plugins_/_contenu_editorial_/spipcarto/exec/config_spipcarto.php
--- _plugins_/_contenu_editorial_/spipcarto/exec/config_spipcarto.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/exec/config_spipcarto.php Fri Jul 28 15:07:02 2006
@@ -74,7 +74,7 @@
) TYPE=MyISAM;");
spip_query("ALTER TABLE `".$table_pref."_groupes_mots` ADD `carto_objets` CHAR( 3 ) NOT NULL AFTER `syndic` ;");
spip_query("ALTER TABLE `".$table_pref."_groupes_mots` ADD INDEX ( `carto_objets` ) ;");
- spip_query("INSERT INTO `".$table_pref."_carto_srs` (id_carto_srs, label, code) VALUES ('-1', 'Par défaut', '-1');");
+ spip_query("INSERT INTO `".$table_pref."_carto_srs` (id_carto_srs, label, code) VALUES ('-1', 'Par defaut', '-1');");
spip_query("INSERT INTO `".$table_pref."_carto_srs` (label, code) VALUES ('NTF (Paris) / Lambert zone II étendu', 'EPSG:27582');");
spip_query("INSERT INTO `".$table_pref."_carto_srs` (label, code) VALUES ('NTF (Paris) / Lambert zone II', 'EPSG:27572');");
spip_query("INSERT INTO `".$table_pref."_carto_srs` (label, code) VALUES ('NTF (Paris) / Lambert zone III', 'EPSG:27573');");
Modified: _plugins_/_contenu_editorial_/spipcarto/inc/carto.php
--- _plugins_/_contenu_editorial_/spipcarto/inc/carto.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/inc/carto.php Fri Jul 28 15:07:02 2006
@@ -88,10 +88,37 @@
}
function afficher_cartes($titre_table, $requete, $icone = '') {
- global $couleur_claire, $couleur_foncee;
- global $connect_id_auteur;
+ global $connect_id_auteur, $connect_statut;
+ global $spip_lang_right, $couleur_claire, $spip_lang;
+
+ $select = $requete['SELECT'] ? $requete['SELECT'] : '*';
+ $from = $requete['FROM'] ? $requete['FROM'] : 'spip_articles AS articles';
+ $join = $requete['JOIN'] ? (' LEFT JOIN ' . $requete['JOIN']) : '';
+ $where = $requete['WHERE'] ? (' WHERE ' . $requete['WHERE']) : '';
+ $order = $requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '';
+ $group = $requete['GROUP BY'] ? (' GROUP BY ' . $requete['GROUP BY']) : '';
+ $limit = $requete['LIMIT'] ? (' LIMIT ' . $requete['LIMIT']) : '';
+
+ $cpt = "$from$where";
+ $tmp_var = substr(md5($cpt), 0, 4);
+
+ //if (!$group){
+ $cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM $cpt"));
+ if (! ($cpt = $cpt['n'])) return $tous_id ;
+ /*}
+ else
+ $cpt = spip_num_rows(spip_query("SELECT $select FROM $cpt"));
+ */
+ if ($requete['LIMIT']) $cpt = min($requete['LIMIT'], $cpt);
+
+ $nb_aff = 1.5 * _TRANCHES;
+ $deb_aff = intval(_request('t_' .$tmp_var));
+
+ if ($cpt > $nb_aff) {
+ $nb_aff = (_TRANCHES);
+ $tranches = afficher_tranches_requete($cpt, 3, $tmp_var, '', $nb_aff);
+ }
- $tranches = afficher_tranches_requete($requete, 3);
if (!$icone) $icone = "../"._DIR_PLUGIN_SPIPCARTO."/img/carte-24.png";
if ($tranches) {
@@ -102,7 +129,7 @@
echo $tranches;
- $result = spip_query($requete);
+ $result = spip_query("SELECT $select FROM $from$join$where$group$order LIMIT $deb_aff, $nb_aff");
$num_rows = spip_num_rows($result);
$ifond = 0;
@@ -132,8 +159,11 @@
//articles liés
afficher_articles(_T("spipcarto:carte_articles_use"),
- ", spip_carto_cartes_articles AS lien WHERE lien.id_article=articles.id_article ".
[... 2941 lines stripped ...]