From abed282698c3652a0630bf99beecec0dedde680b Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 29 Sep 2008 20:09:49 +0200 Subject: [PATCH] Some fixes and updates. --- modules/fusionax.php | 4 ++-- modules/fusionax/Activites.sql | 6 +++--- modules/fusionax/Entreprises.sql | 2 +- modules/search.php | 8 ++++---- upgrade/merge-0.0.1/03_corps.sql | 10 ++++++---- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/fusionax.php b/modules/fusionax.php index 9e512eb..66064ad 100644 --- a/modules/fusionax.php +++ b/modules/fusionax.php @@ -201,7 +201,7 @@ class FusionAxModule extends PLModule AND ax.prenom = xorg.prenom AND xorg.promo = ax.promotion_etude) GROUP BY xorg.user_id - HAVING xorg.user_id IS NOT NULL AND nbMatches = 1" . ($limit ? ('LIMIT ' . $limit) : '')); + HAVING xorg.user_id IS NOT NULL AND nbMatches = 1 " . ($limit ? ('LIMIT ' . $limit) : '')); if ($easy_to_link->total() > 0 || $sure) { return $easy_to_link; } @@ -308,7 +308,7 @@ class FusionAxModule extends PLModule $page->assign('deceasedMissingInAX', XDB::iterator('SELECT d.user_id, d.id_ancien, d.nom, d.prenom, d.promo, d.deces_xorg, CONCAT(d.prenom, " ", d.nom) AS display_name - FROM fusionax_deceased AD d + FROM fusionax_deceased AS d WHERE d.deces_ax = "0000-00-00" LIMIT 10')); $page->assign('deceasedDifferent', diff --git a/modules/fusionax/Activites.sql b/modules/fusionax/Activites.sql index 0db6b8d..33ddbdc 100644 --- a/modules/fusionax/Activites.sql +++ b/modules/fusionax/Activites.sql @@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `fusionax_activites` ( `AC` CHAR(2) NOT NULL COMMENT 'Vaut toujours AC pour cette table', `id_ancien` VARCHAR(8) NOT NULL COMMENT 'Id unique de l''ancien', `hash_activite` BINARY(5) NOT NULL COMMENT 'Hash de cette ligne pour la lier à l''adresse', - `Code_etab` INT(10) NOT NULL COMMENT 'Code de l''établissement', + `Code_etab` BIGINT(10) NOT NULL COMMENT 'Code de l''établissement', `Raison_sociale` VARCHAR(255) collate utf8_general_ci NOT NULL COMMENT 'Raison sociale de l''établissement', `Libelle_fonctio` VARCHAR(255) collate utf8_general_ci NOT NULL COMMENT 'Libéllé de la fonction', `Annuaire` BOOLEAN NOT NULL COMMENT 'publiable dans l''annuaire papier', @@ -15,8 +15,8 @@ CREATE TABLE IF NOT EXISTS `fusionax_activites` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; LOAD DATA LOCAL INFILE 'Activites.txt' INTO TABLE `fusionax_activites` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n' -(AC, id_ancien, Code_etab, Raison_sociale, Libelle_fonctio, Annuaire, +(AC, id_ancien, Code_etab, Raison_sociale, Libelle_fonctio, Annuaire, @Ligne1, @Ligne2, @Ligne3, @code_postal, @ville, @zip_cedex, @etat_distr, @pays, @tel, @fax, @StringDate_maj) -SET +SET `hash_activite` = SUBSTRING( MD5( CONCAT(Code_etab, Libelle_fonctio) ), 1, 5), `Date_maj` = CONCAT(SUBSTRING(@StringDate_maj,7),'-',SUBSTRING(@StringDate_maj,4,2),'-',SUBSTRING(@StringDate_maj,1,2)); diff --git a/modules/fusionax/Entreprises.sql b/modules/fusionax/Entreprises.sql index 3e4d471..a14ccd1 100644 --- a/modules/fusionax/Entreprises.sql +++ b/modules/fusionax/Entreprises.sql @@ -4,7 +4,7 @@ DROP TABLE IF EXISTS `fusionax_entreprises`; CREATE TABLE IF NOT EXISTS `fusionax_entreprises` ( `EN` CHAR(2) NOT NULL COMMENT 'Vaut toujours EN pour cette table', - `Code_etab` INT(10) NOT NULL COMMENT 'Code de l''établissement', + `Code_etab` BIGINT(10) NOT NULL COMMENT 'Code de l''établissement', `Raison_sociale` VARCHAR(255) collate utf8_general_ci NOT NULL COMMENT 'Raison sociale de l''établissement', `Sigle` VARCHAR(50) collate utf8_general_ci NOT NULL COMMENT 'Sigle de l''établissement', `Date_maj` DATE NOT NULL COMMENT 'Date de mise à jour de ces informations', diff --git a/modules/search.php b/modules/search.php index 2e913df..5ab4df8 100644 --- a/modules/search.php +++ b/modules/search.php @@ -24,11 +24,11 @@ class SearchModule extends PLModule function handlers() { return array( - 'search' => $this->make_hook('quick', AUTH_PUBLIC), - 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE), + 'search' => $this->make_hook('quick', AUTH_PUBLIC), + 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE), 'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC), - 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH), - 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH), + 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH), + 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH), ); } diff --git a/upgrade/merge-0.0.1/03_corps.sql b/upgrade/merge-0.0.1/03_corps.sql index 402f38e..856d082 100644 --- a/upgrade/merge-0.0.1/03_corps.sql +++ b/upgrade/merge-0.0.1/03_corps.sql @@ -551,7 +551,7 @@ INSERT IGNORE INTO profile_corps_enum (abbreviation, name, still_exists) ("Z", "Ancien élève étranger", 0), ("Aé", "Arm.Aéronautique", 0), ("ABC", "Arme blindée", 0), - ("Arm", "Armement", 1), + ("Arm", "Ingénieurs de l'Armement", 1), ("A", "Artillerie", 0), ("AC", "Artillerie coloniale", 0), ("AM", "Artillerie de Marine", 0), @@ -562,7 +562,7 @@ INSERT IGNORE INTO profile_corps_enum (abbreviation, name, still_exists) ("Cha", "Chars de Combat", 0), ("C.A", "Commissaire de l'Air", 0), ("C.M", "Commissariat de la Marine", 0), - ("C.Ap", "Contrôle des Assurances", 0), + ("C.Ap", "Contrôle des Assurances", 1), ("EF.Ma", "E.& F. du Maroc", 0), ("E.F", "Eaux et Forêts", 0), ("EFC", "Eaux et Forêts des Colonies", 0), @@ -610,7 +610,7 @@ INSERT IGNORE INTO profile_corps_enum (abbreviation, name, still_exists) ("Bât.", "Service des Bâtiments", 0), ("C.F", "SNCF", 0), ("Sp", "Sports", 0), - ("Téléc", "Télécommunications", 0), + ("Téléc", "Télécommunications", 1), ("Té.A", "Télécommunications d'Armement", 0), ("Tr", "Train", 0), ("Tra", "Transmissions", 0), @@ -618,7 +618,9 @@ INSERT IGNORE INTO profile_corps_enum (abbreviation, name, still_exists) ("TPC", "Travaux publics des Colonies", 0), ("TP Ic", "Travaux publics en Indochine", 0), ("TPOM", "Travaux publics Outre-Mer", 0), - ("TdM", "Troupes de Marine", 0); + ("TdM", "Troupes de Marine", 0), + ("INSEE", "Administrateurs de l'INSEE", 1), + ("Off", "Officiers des Armées", 1); INSERT IGNORE INTO profile_corps (uid, original_corpsid, current_corpsid, rankid, corps_pub) SELECT u.user_id, c.id, c.id, r.id, 'ax' -- 2.1.4