Shortens profile_name_search* in profile_name*.

diff --git a/bin/cron/checkdb.php b/bin/cron/checkdb.php
index 822cda5..c4ef1b1 100755 (executable)
--- a/bin/cron/checkdb.php
+++ b/bin/cron/checkdb.php
@@ -191,8 +191,8 @@ check("SELECT  matricule,nom,prenom,matricule_ax,COUNT(matricule_ax) AS c
 
 /* no alumni is allowed to have empty names */
 check("SELECT  s.uid, d.public_name
-         FROM  profile_name_search AS s
-   INNER JOIN  profile_display     AS d ON (d.pid = s.uid)
+         FROM  profile_name    AS s
+   INNER JOIN  profile_display AS d ON (d.pid = s.uid)
         WHERE  name = ''", "liste des personnes qui ont un de leur nom de recherche vide");
 
 /* verifie qu'il n'y a pas d'utilisateurs ayant un compte Google Apps désactivé et une redirection encore active vers Google Apps */

diff --git a/include/name.func.inc.php b/include/name.func.inc.php
index 968e251..feb4536 100644 (file)
--- a/include/name.func.inc.php
+++ b/include/name.func.inc.php
@@ -61,7 +61,7 @@ function build_types($pub = null)
         $sql_pub = "";
     }
     $sql = "SELECT  id, name
-              FROM  profile_name_search_enum
+              FROM  profile_name_enum
              WHERE  NOT FIND_IN_SET('not_displayed', flags)" . $sql_pub;
     $sn_types = XDB::iterator($sql);
     $types    = array();
@@ -205,8 +205,8 @@ function build_sn_pub()
 {
     $res = XDB::iterator("SELECT  CONCAT(sn.particle, sn.name) AS fullname, sn.typeid,
                                   sn.particle, sn.name, sn.id
-                            FROM  profile_name_search      AS sn
-                      INNER JOIN  profile_name_search_enum AS e  ON (e.id = sn.typeid)
+                            FROM  profile_name      AS sn
+                      INNER JOIN  profile_name_enum AS e  ON (e.id = sn.typeid)
                            WHERE  sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)
                                   AND FIND_IN_SET('public', e.flags)
                         ORDER BY  NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name",
@@ -227,14 +227,14 @@ function set_alias_names(&$sn_new, $sn_old, $update_new = false, $new_alias = nu
     foreach ($sn_new as $typeid => $sn) {
         if (isset($sn['pub'])) {
             if (isset($sn_old[$typeid]) && ($sn_old[$typeid]['fullname'] == $sn['fullname'] && $update_new)) {
-                XDB::execute("UPDATE  profile_name_search
+                XDB::execute("UPDATE  profile_name
                                  SET  particle = {?}, name = {?}, typeid = {?}
                                WHERE  id = {?} AND pid = {?}",
                              $sn['particle'], $sn['name'], $typeid, $sn_old[$typeid]['id'], S::i('uid'));
                 unset($sn_old[$typeid]);
             } elseif ($update_new
                       || (isset($sn_old[$typeid]) && $sn_old[$typeid]['fullname'] == $sn['fullname'])) {
-                XDB::execute("INSERT INTO  profile_name_search (particle, name, typeid, pid)
+                XDB::execute("INSERT INTO  profile_name (particle, name, typeid, pid)
                                    VALUES  ({?}, {?}, {?}, {?})",
                              $sn['particle'], $sn['name'], $typeid, S::i('uid'));
                 unset($sn_old[$typeid]);
@@ -243,7 +243,7 @@ function set_alias_names(&$sn_new, $sn_old, $update_new = false, $new_alias = nu
             }
         } else {
             if ($sn['fullname'] != '') {
-                XDB::execute("INSERT INTO  profile_name_search (particle, name, typeid, pid)
+                XDB::execute("INSERT INTO  profile_name (particle, name, typeid, pid)
                                    VALUES  ('', {?}, {?}, {?})",
                              $sn['fullname'], $typeid, S::i('uid'));
             }
@@ -253,13 +253,13 @@ function set_alias_names(&$sn_new, $sn_old, $update_new = false, $new_alias = nu
         if (!$update_new) {
             $has_new = true;
             foreach ($sn_old as $typeid => $sn) {
-                XDB::execute("INSERT INTO  profile_name_search (particle, name, typeid, pid)
+                XDB::execute("INSERT INTO  profile_name (particle, name, typeid, pid)
                                    VALUES  ({?}, {?}, {?}, {?})",
                              $sn['particle'], $sn['name'], $typeid, S::i('uid'));
             }
         } else {
             foreach ($sn_old as $typeid => $sn) {
-                XDB::execute("DELETE FROM  profile_name_search
+                XDB::execute("DELETE FROM  profile_name
                                     WHERE  pid = {?} AND id = {?}",
                              S::i('uid'), $sn['id']);
             }

diff --git a/modules/profile.php b/modules/profile.php
index da107c2..51302ed 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -146,7 +146,7 @@ class ProfileModule extends PLModule
         $res = XDB::iterator("SELECT  name, explanations,
                                       FIND_IN_SET('public', flags) AS public,
                                       FIND_IN_SET('has_particle', flags) AS has_particle
-                                FROM  profile_name_search_enum
+                                FROM  profile_name_enum
                                WHERE  NOT FIND_IN_SET('not_displayed', flags)
                             ORDER BY  NOT FIND_IN_SET('public', flags)");
         $page->assign('types', $res);
@@ -543,7 +543,7 @@ class ProfileModule extends PLModule
         header('Content-Type: text/html; charset=utf-8');
         $page->changeTpl('profile/general.searchname.tpl', NO_SKIN);
         $res = XDB::query("SELECT  id, name, FIND_IN_SET('public', flags) AS pub
-                             FROM  profile_name_search_enum
+                             FROM  profile_name_enum
                             WHERE  NOT FIND_IN_SET('not_displayed', flags)
                                    AND NOT FIND_IN_SET('always_displayed', flags)");
         $page->assign('sn_type_list', $res->fetchAllAssoc());

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index 3de46fb..b588836 100644 (file)
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -62,14 +62,14 @@ class ProfileSearchNames implements ProfileSetting
                                              FIND_IN_SET('has_particle', e.flags) AS has_particle,
                                              FIND_IN_SET('always_displayed', e.flags) AS always_displayed,
                                              FIND_IN_SET('public', e.flags) AS pub
-                                       FROM  profile_name_search      AS sn
-                                 INNER JOIN  profile_name_search_enum AS e  ON (e.id = sn.typeid)
+                                       FROM  profile_name      AS sn
+                                 INNER JOIN  profile_name_enum AS e  ON (e.id = sn.typeid)
                                       WHERE  sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)
                                    ORDER BY  NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name",
                                     S::v('uid'));
 
             $sn_types = XDB::iterator("SELECT  id, name, FIND_IN_SET('has_particle', flags) AS has_particle
-                                         FROM  profile_name_search_enum
+                                         FROM  profile_name_enum
                                         WHERE  NOT FIND_IN_SET('not_displayed', flags)
                                                AND FIND_IN_SET('always_displayed', flags)
                                      ORDER BY  id");
@@ -93,8 +93,8 @@ class ProfileSearchNames implements ProfileSetting
             } while ($sn = $sn_all->next());
         } else {
             $res = XDB::query("SELECT  s.particle, s.name
-                                 FROM  profile_name_search      AS s
-                           INNER JOIN  profile_name_search_enum AS e ON (e.id = s.typeid)
+                                 FROM  profile_name      AS s
+                           INNER JOIN  profile_name_enum AS e ON (e.id = s.typeid)
                                 WHERE  s.pid = {?} AND e.name LIKE '%initial'
                              ORDER BY  e.name = 'Prénom initial'",
                              S::i('uid'));
@@ -160,8 +160,8 @@ class ProfileSearchNames implements ProfileSetting
         require_once 'name.func.inc.php';
         $sn_old = build_sn_pub();
         XDB::execute("DELETE FROM  s
-                            USING  profile_name_search      AS s
-                       INNER JOIN  profile_name_search_enum AS e ON (s.typeid = e.id)
+                            USING  profile_name      AS s
+                       INNER JOIN  profile_name_enum AS e ON (s.typeid = e.id)
                             WHERE  s.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)",
                      S::i('uid'));
         $has_new = set_alias_names($this->search_names, $sn_old);

diff --git a/upgrade/newdirectory-0.0.1/00_names.sql b/upgrade/newdirectory-0.0.1/00_names.sql
index 7497faf..3a31193 100644 (file)
--- a/upgrade/newdirectory-0.0.1/00_names.sql
+++ b/upgrade/newdirectory-0.0.1/00_names.sql
@@ -24,9 +24,9 @@ INSERT INTO  profile_display (pid, yourself, public_name, private_name, director
   LEFT JOIN  auth_user_quick AS q ON (u.user_id = q.user_id);
 
 
-DROP TABLE IF EXISTS profile_name_search_enum;
+DROP TABLE IF EXISTS profile_name_enum;
 
-CREATE TABLE IF NOT EXISTS profile_name_search_enum (
+CREATE TABLE IF NOT EXISTS profile_name_enum (
   id TINYINT(2) UNSIGNED NOT NULL AUTO_INCREMENT,
   name VARCHAR(255) NOT NULL,
   explanations VARCHAR(255) NOT NULL,
@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS profile_name_search_enum (
   UNIQUE (name)
 ) CHARSET=utf8;
 
-INSERT INTO  profile_name_search_enum (name, flags, explanations)
+INSERT INTO  profile_name_enum (name, flags, explanations)
      VALUES  ('Nom patronymique', 'has_particle,always_displayed,public', 'Le nom de famille avec lequel tu es né'),
              ('Nom marital', 'has_particle,always_displayed,public',
               'Ton nom d\'épouse ou d\'époux'),
@@ -52,9 +52,9 @@ INSERT INTO  profile_name_search_enum (name, flags, explanations)
              ('Prénom initial', 'has_particle,not_displayed,public', '');
 
 
-DROP TABLE IF EXISTS profile_name_search;
+DROP TABLE IF EXISTS profile_name;
 
-CREATE TABLE IF NOT EXISTS profile_name_search (
+CREATE TABLE IF NOT EXISTS profile_name (
   id TINYINT(2) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id of this name for this user',
   pid INT(11) NOT NULL COMMENT 'id of alumni',
   name VARCHAR(255) NOT NULL COMMENT 'name to search for',
@@ -64,40 +64,40 @@ CREATE TABLE IF NOT EXISTS profile_name_search (
   INDEX pid (pid)
 ) CHARSET=utf8 COMMENT = 'Names of alumni (search table)';
 
-INSERT INTO  profile_name_search (pid, name, typeid)
+INSERT INTO  profile_name (pid, name, typeid)
      SELECT  u.user_id, u.nom, e.id
-       FROM  auth_user_md5            AS u
- INNER JOIN  profile_name_search_enum AS e ON (e.name = 'Nom patronymique')
+       FROM  auth_user_md5     AS u
+ INNER JOIN  profile_name_enum AS e ON (e.name = 'Nom patronymique')
       WHERE  nom != '';
 
-INSERT INTO  profile_name_search (pid, name, typeid)
+INSERT INTO  profile_name (pid, name, typeid)
      SELECT  u.user_id, u.nom_ini, e.id
-       FROM  auth_user_md5            AS u
- INNER JOIN  profile_name_search_enum AS e ON (e.name = 'Nom initial')
+       FROM  auth_user_md5     AS u
+ INNER JOIN  profile_name_enum AS e ON (e.name = 'Nom initial')
       WHERE  nom_ini != '';
 
-INSERT INTO  profile_name_search (pid, name, typeid)
+INSERT INTO  profile_name (pid, name, typeid)
      SELECT  u.user_id, u.prenom, e.id
-       FROM  auth_user_md5            AS u
- INNER JOIN  profile_name_search_enum AS e ON (e.name = 'Prénom')
+       FROM  auth_user_md5     AS u
+ INNER JOIN  profile_name_enum AS e ON (e.name = 'Prénom')
       WHERE  prenom != '';
 
-INSERT INTO  profile_name_search (pid, name, typeid)
+INSERT INTO  profile_name (pid, name, typeid)
      SELECT  u.user_id, u.prenom_ini, e.id
-       FROM  auth_user_md5            AS u
- INNER JOIN  profile_name_search_enum AS e ON (e.name = 'Prénom initial')
+       FROM  auth_user_md5     AS u
+ INNER JOIN  profile_name_enum AS e ON (e.name = 'Prénom initial')
       WHERE  prenom_ini != '';
 
-INSERT INTO  profile_name_search (pid, name, typeid)
+INSERT INTO  profile_name (pid, name, typeid)
      SELECT  u.user_id, u.nom_usage, e.id
-       FROM  auth_user_md5            AS u
- INNER JOIN  profile_name_search_enum AS e ON (e.name = 'Nom usuel')
+       FROM  auth_user_md5     AS u
+ INNER JOIN  profile_name_enum AS e ON (e.name = 'Nom usuel')
       WHERE  nom_usage != '';
 
-INSERT INTO  profile_name_search (pid, name, typeid)
+INSERT INTO  profile_name (pid, name, typeid)
      SELECT  q.user_id, q.profile_nick, e.id
-       FROM  auth_user_quick          AS q
- INNER JOIN  profile_name_search_enum AS e ON (e.name = 'Surnom')
+       FROM  auth_user_quick   AS q
+ INNER JOIN  profile_name_enum AS e ON (e.name = 'Surnom')
       WHERE  profile_nick != '';
 
 -- vim:set syntax=mysql: