From d53a8523f3d8f8dbec201b236f8cfbab4b0e5366 Mon Sep 17 00:00:00 2001
From: Ludovic CHEVALIER <l.chevalier@lespetitsdebrouillards-ra.org>
Date: Thu, 21 Jun 2012 17:00:43 +0200
Subject: [PATCH] spip2->spip3

---
 MIGRATION                    | 5 +++++
 inclure/liste_gis.html       | 5 ++---
 inclure/liste_pays.html      | 2 +-
 inclure/requete_pays.html    | 4 ++--
 inclure/requete_regions.html | 2 +-
 plugin.xml                   | 6 +++---
 6 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 MIGRATION

diff --git a/MIGRATION b/MIGRATION
new file mode 100644
index 0000000..34a5e0f
--- /dev/null
+++ b/MIGRATION
@@ -0,0 +1,5 @@
+Migration GIS2->GIS3
+####################
+Lancer cette requete pour relier à nouveau les points à leur sites correspondants:
+    UPDATE `spip_gis_liens` SET `objet`='site' WHERE `objet`='syndic';
+
diff --git a/inclure/liste_gis.html b/inclure/liste_gis.html
index 7c41367..5741d26 100644
--- a/inclure/liste_gis.html
+++ b/inclure/liste_gis.html
@@ -1,5 +1,4 @@
-
-#SET{req_gis,#VAL{"SELECT DISTINCT spip_gis.*, spip_syndic.* FROM spip_mots, spip_mots_syndic, spip_syndic, spip_gis, spip_gis_liens WHERE spip_mots.type='Ateliers' AND spip_mots_syndic.id_syndic=spip_syndic.id_syndic AND spip_syndic.id_syndic=spip_gis_liens.id_objet AND spip_gis.id_gis=spip_gis_liens.id_gis AND spip_gis_liens.objet='syndic' AND spip_gis.pays='"}|concat{#ENV{mon_pays}}|concat{"' AND spip_gis.region='"}|concat{#ENV{ma_region}}|concat{"' ORDER BY spip_gis.ville"}}
+#SET{req_gis,#VAL{"SELECT DISTINCT spip_gis.*, spip_syndic.* FROM spip_mots, spip_mots_liens, spip_syndic, spip_gis, spip_gis_liens WHERE spip_mots.type='Ateliers' AND spip_mots_liens.objet='site' AND spip_mots_liens.id_objet=spip_syndic.id_syndic AND spip_syndic.id_syndic=spip_gis_liens.id_objet AND spip_gis.id_gis=spip_gis_liens.id_gis AND spip_gis_liens.objet='site' AND spip_gis.pays='"}|concat{#ENV{mon_pays}}|concat{"' AND spip_gis.region='"}|concat{#ENV{ma_region}}|concat{"' ORDER BY spip_gis.ville"}}
 
 <BOUCLE_sql(DATA){source sql,#GET{req_gis}}>
     <ul class="spip">
@@ -19,7 +18,7 @@
                     |image_recadre{45,45,center}
                     |image_aplatir{jpg,ffffff}
                     |inserer_attribut{class,spip_logos})]
-                    #VILLE (#CODE_POSTAL) - <a href="#URL_SITE"> #TITRE </a> - #ADRESSE
+                    #VILLE (#CODE_POSTAL) - <a href="#VALEUR{url_site}"> #TITRE </a> - #ADRESSE
                 </li>
         </BOUCLE_points>
     </ul>
diff --git a/inclure/liste_pays.html b/inclure/liste_pays.html
index 825ed09..64e4d7c 100644
--- a/inclure/liste_pays.html
+++ b/inclure/liste_pays.html
@@ -7,4 +7,4 @@
 [(#ENV{afficher_regions}|=={oui}|oui)
     <h2 class="h2 spip">#ENV{mon_pays}</h2>
     <INCLURE{fond=inclure/requete_regions}{ajax}{env}>
-]
\ No newline at end of file
+]
diff --git a/inclure/requete_pays.html b/inclure/requete_pays.html
index 86a37c8..058e95f 100644
--- a/inclure/requete_pays.html
+++ b/inclure/requete_pays.html
@@ -1,5 +1,5 @@
-#SET{req_pays,"SELECT spip_gis.pays FROM spip_mots, spip_mots_syndic, spip_syndic, spip_gis, spip_gis_liens WHERE spip_mots.type='Ateliers' AND spip_mots_syndic.id_syndic=spip_syndic.id_syndic AND spip_syndic.id_syndic=spip_gis_liens.id_objet AND spip_gis.id_gis=spip_gis_liens.id_gis AND spip_gis_liens.objet='syndic'  GROUP BY spip_gis.pays"}
+#SET{req_pays,"SELECT spip_gis.pays FROM spip_mots, spip_mots_liens, spip_syndic, spip_gis, spip_gis_liens WHERE spip_mots.type = 'Ateliers' AND spip_mots_liens.objet = 'site' AND spip_mots_liens.id_objet = spip_syndic.id_syndic AND spip_syndic.id_syndic = spip_gis_liens.id_objet AND spip_gis.id_gis = spip_gis_liens.id_gis AND spip_gis_liens.objet = 'site' GROUP BY spip_gis.pays"}
 
 <BOUCLE_sql(DATA){source sql, #GET{req_pays}}>
     <INCLURE{fond=inclure/liste_pays}{ajax}{env}{mon_pays=#PAYS}>
-</BOUCLE_sql>
\ No newline at end of file
+</BOUCLE_sql>
diff --git a/inclure/requete_regions.html b/inclure/requete_regions.html
index 6a67497..0966812 100644
--- a/inclure/requete_regions.html
+++ b/inclure/requete_regions.html
@@ -1,4 +1,4 @@
-#SET{req_regions,#VAL{"SELECT spip_gis.region FROM spip_mots, spip_mots_syndic, spip_syndic, spip_gis, spip_gis_liens WHERE spip_mots.type='Ateliers' AND spip_mots_syndic.id_syndic=spip_syndic.id_syndic AND spip_syndic.id_syndic=spip_gis_liens.id_objet AND spip_gis.id_gis=spip_gis_liens.id_gis AND spip_gis_liens.objet='syndic' AND spip_gis.pays='"}|concat{#ENV{mon_pays}}|concat{"' GROUP BY spip_gis.region"}}
+#SET{req_regions,#VAL{"SELECT spip_gis.region FROM spip_mots, spip_mots_liens, spip_syndic, spip_gis, spip_gis_liens WHERE spip_mots.type='Ateliers' AND spip_mots_liens.objet='site' AND spip_mots_liens.id_objet=spip_syndic.id_syndic AND spip_syndic.id_syndic=spip_gis_liens.id_objet AND spip_gis.id_gis=spip_gis_liens.id_gis AND spip_gis_liens.objet='site' AND spip_gis.pays='"}|concat{#ENV{mon_pays}}|concat{"' GROUP BY spip_gis.region"}}
 
 <BOUCLE_sql(DATA){source sql,#GET{req_regions}}>
     <INCLURE{fond=inclure/liste_regions}{ajax}{env}{ma_region=#REGION}>
diff --git a/plugin.xml b/plugin.xml
index 2b8fd66..8a4f38a 100755
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,6 +1,6 @@
 <plugin>
     <nom>Carte de sites par mot clé avec Leaflet</nom>
-    <version>0.5.2.1</version>
+    <version>0.6</version>
     <auteur>L'Heureux Cyclage</auteur>
     <licence>GNU/GPL</licence>
     <description>
@@ -10,8 +10,8 @@
     </description>
     <prefix>carte_de_sites</prefix>
     <etat>dev</etat>
-    <necessite id="SPIP" version="[2.1.11;2.1.99]" />
-    <necessite id="gis" version= "[2.1.1;]" />
+    <necessite id="SPIP" version="[3.0.0;3.0.99]" />
+    <necessite id="gis" version= "[3.3.7;]" />
     <necessite id="Iterateurs" version= "[0.6.1;]" />
     <necessite
         id="lib:CloudMade-Leaflet-538dfb4"
-- 
2.20.1