Changeset 95023 in spip-zone for _plugins_/COG

Timestamp:

Feb 8, 2016, 12:43:44 PM (5 years ago)

Author:

guillaume.wauquier@…

Message:

Ajoute une colonne region_anncienne à la table departements pour ne pas perdre l'information.

Location:

_plugins_/COG/trunk

Files:

• base/cog.php (modified) (1 diff)
• cog_administrations.php (modified) (3 diffs)
• paquet.xml (modified) (1 diff)

_plugins_/COG/trunk/base/cog.php

@@ -146 +146 @@
                         "type_charniere"=> "TINYINT( 1 ) UNSIGNED NOT NULL              COMMENT 'Type de nom en clair'",
                         "nom_majuscule"=> "VARCHAR( 70 ) NOT NULL       COMMENT 'Nom en clair (majuscules)'",
-                        "nom"=> "VARCHAR( 70 ) NOT NULL COMMENT 'Nom en clair (typographie riche)'"
+                        "nom"=> "VARCHAR( 70 ) NOT NULL COMMENT 'Nom en clair (typographie riche)'",
+                        "region_ancienne"=> "TINYINT( 2 )  UNSIGNED NOT NULL    COMMENT 'Code région avant 2016'",
                 ),
                 'key' => array(

_plugins_/COG/trunk/cog_administrations.php

@@ -27 +27 @@
                 array('sql_alter',"TABLE spip_cog_regions_anciennes CHANGE `id_cog_region` `id_cog_region_ancienne` INT(10) auto_increment UNSIGNED NOT NULL COMMENT 'Identifiant du region' "),
                 array('sql_alter',"TABLE spip_cog_regions_anciennes ADD `region2016` TINYINT ( 2 )  UNSIGNED NOT NULL   COMMENT 'Code région 2016'"),
-                array('maj_tables', array('spip_cog_regions')),
-                array('cog_nouvelle_definition_regionale')
-
+                array('maj_tables', array('spip_cog_regions'))
         );
-        $maj['1.3'] = array(array('cog_nouvelle_definition_regionale'));
+        $maj['1.4'] = array(    array('maj_tables', array('spip_cog_departements')),
+                                                        array('cog_nouvelle_definition_regionale'));
         include_spip('base/upgrade');
         maj_plugin($nom_meta_base_version, $version_cible, $maj);
@@ -75 +74 @@
                                 $tab_region[trim($tab[0]).'']=trim($tab[5]);
                         sql_updateq('spip_cog_regions_anciennes',array('region2016'=>intval(trim($tab[5]))),'code = '.intval(trim($tab[0])));
+                        $data=array('region'=>intval(trim($tab[5])),'region_ancienne'=>intval(trim($tab[0])));
+                        sql_updateq('spip_cog_departements',$data,'region = '.intval(trim($tab[0])) );
                 }
         }
@@ -84 +85 @@
         'spip_cog_communes',
         'spip_cog_cantons',
-        'spip_cog_arrondissements',
-        'spip_cog_departements');
+        'spip_cog_arrondissements');
 
 foreach($tab_table as $table){

_plugins_/COG/trunk/paquet.xml

@@ -2 +2 @@
         prefix="cog"
         categorie="outil"
-        version="2.3.0"
+        version="2.3.1"
         etat="stable"
         compatibilite="[3.0.0;3.1.*]"
         logo="prive/themes/spip/images/cog-32.png"
-        schema="1.3"
+        schema="1.4"
         documentation="http://contrib.spip.net/COG-Toutes-les-communes-departements-regions"
 >