X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Ffusionax%2FActivites.sql;h=e412b1501769f5b8b99c3ea5a18b42f0a0a4be32;hb=3422f7193e38e67054d2ecda2f4a68b64bd310ef;hp=b4361006a1e5116fe94e281b920636fa024fbac3;hpb=1c4a1d0a32c52851e9ffbbf585bb206c9a472dc9;p=platal.git

diff --git a/modules/fusionax/Activites.sql b/modules/fusionax/Activites.sql
index b436100..e412b15 100644
--- a/modules/fusionax/Activites.sql
+++ b/modules/fusionax/Activites.sql
@@ -9,12 +9,22 @@ CREATE TABLE IF NOT EXISTS `fusionax_activites` (
   `Raison_sociale` VARCHAR(255) NOT NULL COMMENT 'Raison sociale de l''établissement',
   `Libelle_fonctio` VARCHAR(255) NOT NULL COMMENT 'Libéllé de la fonction',
   `Annuaire` BOOLEAN NOT NULL COMMENT 'publiable dans l''annuaire papier',
-  PRIMARY KEY( `ax_id` , `Code_etab` )
+  pid INT(11) UNSIGNED DEFAULT NULL,
+  jobid INT(6) UNSIGNED DEFAULT NULL,
+  description VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`ax_id`, `Code_etab`),
+  INDEX (Code_etab),
+  INDEX (pid),
+  INDEX (jobid)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-LOAD DATA LOCAL INFILE '{?}Activites.txt' INTO TABLE `fusionax_activites` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
+LOAD DATA LOCAL INFILE '{?}Activites.txt' INTO TABLE `fusionax_activites` CHARACTER SET utf8 FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
 (AC, ax_id, Code_etab, Raison_sociale, Libelle_fonctio, Annuaire,
 @Ligne1, @Ligne2, @Ligne3, @code_postal, @ville, @zip_cedex, @etat_distr, @pays, @tel, @fax, @StringDate_maj);
 
 
 UPDATE fusionax_activites SET Raison_sociale = TRIM(Raison_sociale), Libelle_fonctio = TRIM(Libelle_fonctio);
+UPDATE  fusionax_activites
+   SET  description = IF(Raison_sociale,
+                         IF(Libelle_fonctio, CONCAT(Raison_sociale, ', ', Libelle_fonctio), Raison_sociale),
+                         Libelle_fonctio);