Some clean up.

[platal.git] / modules / search.php

diff --git a/modules/search.php b/modules/search.php
index 062b676..1de908c 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -56,21 +56,24 @@ class SearchModule extends PLModule
             $school = Env::i('school');
         }
 
-        if (!is_null($school)) {
-            $sql = 'SELECT type FROM applis_def WHERE id=' . $school;
+        if ((!is_null($school)) && ($school != '')) {
+            $sql = 'SELECT  degreeid
+                      FROM  profile_education_degree
+                     WHERE  eduid=' . $school;
         } else {
-            $sql = 'DESCRIBE applis_def type';
+            $sql = 'SELECT  id
+                      FROM  profile_education_degree_enum
+                  ORDER BY  id';
         }
 
         $res = XDB::query($sql);
-        $row = $res->fetchOneRow();
-        if (!is_null($school)) {
-            $types = $row[0];
-        } else {
-            $types = explode('(',$row[1]);
-            $types = str_replace("'","",substr($types[1],0,-1));
-        }
-        Platal::page()->assign('choix_diplomas', explode(',',$types));
+        Platal::page()->assign('choix_diplomas', $res->fetchColumn());
+
+        $sql = 'SELECT  degree
+                  FROM  profile_education_degree_enum
+              ORDER BY  id';
+        $res = XDB::query($sql);
+        Platal::page()->assign('name_diplomas', $res->fetchColumn());
     }
 
     function handler_quick(&$page, $action = null, $subaction = null)
@@ -169,19 +172,19 @@ class SearchModule extends PLModule
             $this->form_prepare();
         } else {
             $textFields = array(
-                'country' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'pays', 'exact' => false),
-                'fonction' => array('field' => 'id', 'table' => 'fonctions_def', 'text' => 'fonction_fr', 'exact' => true),
-                'secteur' => array('field' => 'id', 'table' => 'emploi_secteur', 'text' => 'label', 'exact' => false),
-                'nationalite' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'nat', 'exact' => 'false'),
-                'binet' => array('field' => 'id', 'table' => 'binets_def', 'text' => 'text', 'exact' => false),
+                'country'         => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'pays', 'exact' => false),
+                'fonction'        => array('field' => 'id', 'table' => 'fonctions_def', 'text' => 'fonction_fr', 'exact' => true),
+                'secteur'         => array('field' => 'id', 'table' => 'emploi_secteur', 'text' => 'label', 'exact' => false),
+                'nationalite'     => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'nat', 'exact' => 'false'),
+                'binet'           => array('field' => 'id', 'table' => 'binets_def', 'text' => 'text', 'exact' => false),
                 'networking_type' => array('field' => 'network_type', 'table' => 'profile_networking_enum',
                                            'text' => 'name', 'exact' => false),
-                'groupex' => array('field' => 'id', 'table' => 'groupex.asso',
-                                   'text' => "(a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public' AND nom",
-                                   'exact' => false),
-                'section' => array('field' => 'id', 'table' => 'sections', 'text' => 'text', 'exact' => false),
-                'school' => array('field' => 'id', 'table' => 'applis_def', 'text' => 'text', 'exact' => false),
-                'city' => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false)
+                'groupex'         => array('field' => 'id', 'table' => 'groupex.asso',
+                                           'text' => "(a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public' AND nom",
+                                           'exact' => false),
+                'section'         => array('field' => 'id', 'table' => 'sections', 'text' => 'text', 'exact' => false),
+                'school'          => array('field' => 'id', 'table' => 'profile_education_enum', 'text' => 'name', 'exact' => false),
+                'city'            => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false)
             );
             if (!Env::has('page')) {
                 S::logger()->log('search', 'adv=' . var_export($_GET, true));
@@ -261,7 +264,7 @@ class SearchModule extends PLModule
           case 'binetTxt':
             $db = '`binets_def` INNER JOIN
                    `binets_ins` ON(`binets_def`.`id` = `binets_ins`.`binet_id`)';
-            $field='`binets_def`.`text`';
+            $field = '`binets_def`.`text`';
             if (strlen($q) > 2)
                 $beginwith = false;
             $realid = '`binets_def`.`id`';
@@ -282,15 +285,15 @@ class SearchModule extends PLModule
           case 'countryTxt':
             $db = '`geoloc_pays` INNER JOIN
                    `adresses` ON(`geoloc_pays`.`a2` = `adresses`.`country`)';
-            $unique='`uid`';
+            $unique = '`uid`';
             $field = '`geoloc_pays`.`pays`';
             $field2 = '`geoloc_pays`.`country`';
-            $realid='`geoloc_pays`.`a2`';
+            $realid = '`geoloc_pays`.`a2`';
             break;
           case 'entreprise':
             $db = '`entreprises`';
             $field = '`entreprise`';
-            $unique='`uid`';
+            $unique = '`uid`';
             break;
           case 'firstname':
             $field = '`prenom`';
@@ -339,14 +342,14 @@ class SearchModule extends PLModule
           case 'poste':
             $db = '`entreprises`';
             $field = '`poste`';
-            $unique='`uid`';
+            $unique = '`uid`';
             break;
           case 'schoolTxt':
-            $db = '`applis_def` INNER JOIN
-                   `applis_ins` ON(`applis_def`.`id` = `applis_ins`.`aid`)';
-            $field='`applis_def`.`text`';
-            $unique = '`uid`';
-            $realid = '`applis_def`.`id`';
+            $db = 'profile_education_enum INNER JOIN
+                   profile_education ON (profile_education_enum.id = profile_education.eduid)';
+            $field = 'profile_education_enum.name';
+            $unique = 'uid';
+            $realid = 'profile_education_enum.id';
             if (strlen($q) > 2)
                 $beginwith = false;
             break;
@@ -470,7 +473,9 @@ class SearchModule extends PLModule
             }
             break;
           case 'school':
-            $db = '`applis_def`';
+            $db = 'profile_education_enum';
+            $field = 'name';
+            $id = 'id';
             $page->assign('onchange', 'changeSchool(this.value)');
             break;
           case 'section':