Fix some issues with autocompletion in advanced search

[platal.git] / modules / search.php

diff --git a/modules/search.php b/modules/search.php
index b4c4cca..f301cd6 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -129,6 +129,7 @@ class SearchModule extends PLModule
             $view->apply('search', $page, $action, $subaction);
 
             $nb_tot = $view->count();
+            $page->assign('search_results_nb', $nb_tot);
             if ($subaction) {
                 return;
             }
@@ -145,7 +146,7 @@ class SearchModule extends PLModule
         }
 
         require_once dirname(__FILE__) . '/search/search.inc.php';
-        $page->changeTpl('search/index.tpl');            
+        $page->changeTpl('search/index.tpl');
         $page->assign('xorg_title','Polytechnique.org - Annuaire');
     }
 
@@ -159,13 +160,36 @@ class SearchModule extends PLModule
         if (!Env::has('rechercher') && $action != 'geoloc') {
             $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),
+                '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)
+            );
+            foreach ($textFields as $field=>&$query) {
+                if (!Env::v($field) && Env::v($field . 'Txt')) {
+                    $res = XDB::query("SELECT  {$query['field']}
+                                         FROM  {$query['table']}
+                                        WHERE  {$query['text']} " . ($query['exact'] ? " = {?}" :
+                                                                    " LIKE CONCAT('%', {?}, '%')"),
+                                      Env::v($field . 'Txt'));
+                    $_REQUEST[$field] = $res->fetchOneCell();
+                }
+            }
+
             require_once 'userset.inc.php';
             $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf');
             $view->addMod('minifiche', 'Minifiches', true);
             $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
             $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
             $view->apply('search/adv', $page, $action, $subaction);
-            
+
             if ($subaction) {
                 return;
             }
@@ -199,7 +223,7 @@ class SearchModule extends PLModule
                            $_REQUEST['q']);
         if (!$q) exit();
 
-        // try to look in cached results        
+        // try to look in cached results
         $cache = XDB::query('SELECT  `result`
                                FROM  `search_autocomplete`
                               WHERE  `name` = {?} AND
@@ -210,7 +234,7 @@ class SearchModule extends PLModule
             echo $res;
             die();
         }
-        
+
         // default search
         $q = preg_quote($q);
         $unique = '`user_id`';
@@ -219,7 +243,7 @@ class SearchModule extends PLModule
         $beginwith = true;
         $field2 = false;
         $qsearch = $q;
-        
+
         switch ($type) {
           case 'binetTxt':
             $db = '`binets_def` INNER JOIN
@@ -263,13 +287,16 @@ class SearchModule extends PLModule
             $beginwith = false;
             break;
           case 'groupexTxt':
-            $db = '`groupesx_def` INNER JOIN
-                   `groupesx_ins` ON(`groupesx_def`.`id` = `groupesx_ins`.`gid`)';
-            $field='`groupesx_def`.`text`';
+            $db = "groupex.asso AS a INNER JOIN
+                   groupex.membres AS m ON(a.id = m.asso_id
+                                           AND (a.cat = 'GroupesX' OR a.cat = 'Institutions')
+                                           AND a.pub = 'public')";
+            $field='a.nom';
+            $field2 = 'a.diminutif';
             if (strlen($q) > 2)
                 $beginwith = false;
-            $realid = '`groupesx_def`.`id`';
-            $unique = '`guid`';
+            $realid = 'a.id';
+            $unique = 'm.uid';
             break;
           case 'name':
             $field = '`nom`';
@@ -314,7 +341,7 @@ class SearchModule extends PLModule
             $beginwith = false;
             break;
           case 'sectionTxt':
-            $db = '`sections` INNER JOIN 
+            $db = '`sections` INNER JOIN
                    `auth_user_md5` ON(`auth_user_md5`.`section` = `sections`.`id`)';
             $field = '`sections`.`text`';
             $realid = '`sections`.`id`';
@@ -362,7 +389,7 @@ class SearchModule extends PLModule
         echo $res;
         exit();
     }
-    
+
     function handler_list(&$page, $type = null, $idVal = null)
     {
         // Give the list of all values possible of type and builds a select input for it
@@ -390,10 +417,12 @@ class SearchModule extends PLModule
             $page->changeTpl('search/adv.grade.form.tpl', NO_SKIN);
             return;
           case 'groupex':
-            $db = '`groupesx_def`';
+            $db = 'groupex.asso';
+            $where = " WHERE (cat = 'GroupesX' OR cat = 'Institutions') AND pub = 'public'";
+            $field = 'nom';
             break;
           case 'nationalite':
-            $db = '`geoloc_pays` INNER JOIN 
+            $db = '`geoloc_pays` INNER JOIN
                    `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)';
             $field = 'IF(`nat`=\'\', `pays`, `nat`)';
             $id = '`a2`';
@@ -401,7 +430,7 @@ class SearchModule extends PLModule
           case 'region':
             $db = '`geoloc_region`';
             $field = '`name`';
-            $id = '`region`'; 
+            $id = '`region`';
             if (isset($_REQUEST['country'])) {
                 $where .= ' WHERE `a2` = "'.$_REQUEST['country'].'"';
             }
@@ -433,6 +462,8 @@ class SearchModule extends PLModule
                                                FROM  '.$db.$where.'
                                            GROUP BY  '.$field.'
                                            ORDER BY  '.$field));
+        $page->assign('with_text_value', true);
+        $page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text");
     }
 }