X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsearch%2Fsearch.inc.php;h=b2e8744228c881aef870f03ce69e2f01d98f8b67;hb=043bbacf7d5ceaeba4db582ac0ea7c75d6f13c80;hp=0d23a78697aa8f3751234a64e1ab75cd707cc913;hpb=730a173a333507926e0029d8a96c3a26b55756e4;p=platal.git

diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php
index 0d23a78..b2e8744 100644
--- a/modules/search/search.inc.php
+++ b/modules/search/search.inc.php
@@ -48,9 +48,9 @@ function advancedSearchFromInput()
     }
 
     if (!Env::i('cityid')) {
-        $townField      = new RefSField('city',array('ac.city'),'adresses','ac',getadr_join('ac'),false);
+        $townField  = new RefSField('city',array('ac.city', 'ac.postcode'),'adresses','ac',getadr_join('ac'),false);
     } else {
-        $townField    = new RefSField('cityid',array('av.cityid'),'adresses','av',getadr_join('av'));
+        $townField  = new RefSField('cityid',array('av.cityid', 'av.postcode'),'adresses','av',getadr_join('av'));
     }
     $countryField   = new RefSField('country',array('ap.country'),'adresses','ap',getadr_join('ap'));
     $regionField    = new RefSField('region',array('ar.region'),'adresses','ar',getadr_join('ar'));
@@ -62,24 +62,32 @@ function advancedSearchFromInput()
     $secteurField    = new RefSField('secteur',array('fm.secteur'),'entreprises','fm','u.user_id=fm.uid');
     $cvField         = new RefSField('cv',array('u.cv'),'','','',false);
 
-    $natField        = new RefSField('nationalite',array('u.nationalite'),'','','');
+    $natField        = new RefSField('nationalite',array('u.nationalite', 'u.nationalite2', 'u.nationalite3'),'','','');
     $binetField      = new RefSField('binet',array('b.binet_id'),'binets_ins','b','u.user_id=b.user_id');
     $groupexField    = new RefSField('groupex',array('g.id'),array('groupex.asso', 'groupex.membres'),array('g', 'gm'),
                                      array("(g.cat = 'GroupesX' OR g.cat = 'Institutions') AND g.pub = 'public'",
                                            'gm.asso_id = g.id AND u.user_id=gm.uid'));
     $sectionField    = new RefSField('section',array('u.section'),'','','');
-    $schoolField     = new RefSField('school',array('as.aid'),'applis_ins','`as`','u.user_id=as.uid');
-    $diplomaField    = new RefSField('diploma',array('ad.type'),'applis_ins','ad','u.user_id=ad.uid');
+    $schoolField     = new RefSField('school',array('as.eduid'),'profile_education','`as`','u.user_id=as.uid');
+    $diplomaField    = new RefSField('diploma',array('ad.name'),'profile_education','ad','u.user_id=ad.uid');
 
     $freeField       = new RefSField('free',array('q.profile_freetext'),'','','',false);
 
+    $nwAddressField  = new RefSField('networking_address', array('nw.address'), 'profile_networking', 'nw', 'nw.uid=u.user_id', false);
+    if (Env::v('networking_address') == '') {
+        $nwTypeField     = new IndexSField('networking_type', array('nwe.network_type'), array('profile_networking', 'profile_networking_enum'), array('nw', 'nwe'), array('nw.uid = u.user_id', 'nwe.network_type = nw.network_type'));
+    } else {
+        $nwTypeField     = new IndexSField('networking_type', array('nwe.network_type'), 'profile_networking_enum', 'nwe', 'nwe.network_type = nw.network_type');
+    }
+    $nwPhoneField  = new PhoneSField('phone_number', array('t.search_tel'), 'profile_phones', 't', 't.uid=u.user_id');
     return array(
                 $nameField, $firstnameField, $nicknameField, $promo1Field,
-                $promo2Field, $womanField, $subscriberField, $aliveField, $referentField,
+                $promo2Field, $womanField, $subscriberField, $aliveField,
                 $townField, $countryField, $regionField, $mapField, $entrepriseField,
                 $posteField, $secteurField, $cvField, $natField, $binetField,
                 $groupexField, $sectionField, $schoolField, $diplomaField,
-                $freeField, $fonctionField);
+                $freeField, $fonctionField, $nwAddressField, $nwTypeField,
+                $nwPhoneField, $referentField);
 }
 
 // }}}