X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fdirenum.php;h=8a3829db4c1770e9c3cc246fb2c32dd4fd07a888;hb=db587ff9c60b630859461ee1e4f030e0c9b09d97;hp=bc3a856b0710bb60a0906fce021665535fbd9263;hpb=cf570028a7cc8748896a708cc8b976d7911ea03c;p=platal.git diff --git a/classes/direnum.php b/classes/direnum.php index bc3a856..8a3829d 100644 --- a/classes/direnum.php +++ b/classes/direnum.php @@ -1,6 +1,6 @@ cacheEnabled() && S::has('__DE_' . $type)) { self::$enumerations[$type] = S::v('__DE_' . $type); } else { $cls = "DE_" . ucfirst($type); $obj = new $cls(); self::$enumerations[$type] = $obj; - if ($obj->capabilities & DirEnumeration::SAVE_IN_SESSION) { + if (Platal::globals()->cacheEnabled() + && $obj->capabilities & DirEnumeration::SAVE_IN_SESSION) { S::set('__DE_' . $type, $obj); } } @@ -93,8 +105,10 @@ class DirEnum self::init($type); } $obj = self::$enumerations[$type]; + $args = func_get_args(); + array_shift($args); if ($obj->capabilities & DirEnumeration::HAS_OPTIONS) { - return call_user_func(array($obj, 'getOptionsIter')); + return call_user_func_array(array($obj, 'getOptionsIter'), $args); } else { return PlIteratorUtils::fromArray(array()); } @@ -197,7 +211,9 @@ abstract class DirEnumeration public function getOptionsIter() { - return PlIteratorUtils::fromArray(self::expandArray($this->getOptions()), 1, true); + $options = $this->getOptions(); + $options = self::expandArray($options); + return PlIteratorUtils::fromArray($options, 1, true); } // {{{ function getIDs @@ -233,6 +249,9 @@ abstract class DirEnumeration } // }}} + /** Builds a list of query parts for searching @$text in @$field : + * field LIKE 'text%', field LIKE '% text%', field LIKE '%-text%' + */ private function mkTests($field, $text) { $tests = array(); @@ -312,37 +331,38 @@ abstract class DE_WithSuboption extends DirEnumeration protected $suboptions = null; - protected function loadOptions() + protected function _fetchSubOptions($subid) { - $opts = XDB::fetchAllAssoc('id', 'SELECT ' . $this->valfield . ' AS field, - ' . $this->optfield . ' AS subid, - ' . $this->idfield . ' AS id - FROM ' . $this->from . ' - ' . $this->join . ' - ' . $this->where . ' - GROUP BY ' . $this->valfield . ' - ORDER BY ' . $this->valfield); - $this->options = array(); - $this->suboptions = array(); - foreach ($opts as $id => $opt) { - $this->options[$id] = $opt['field']; - if (!array_key_exists($opt['subid'], $this->suboptions)) { - $this->suboptions[$opt['subid']] = array(); - } - $this->suboptions[$opt['subid']][$id] = $opt['field']; + if (is_null($this->suboptions)) { + $this->loadSubOptions($subid); } } + protected function loadSubOptions($subid) + { + $where = ($this->where == '') ? '' : $this->where . ' AND '; + $this->suboptions = XDB::fetchAllAssoc('id', 'SELECT ' . $this->valfield . ' AS field, + ' . $this->idfield . ' AS id + FROM ' . $this->from . ' + ' . $this->join . ' + WHERE ' . $where . $this->optfield . ' = ' . $subid . ' + GROUP BY ' . $this->valfield . ' + ORDER BY ' . $this->valfield); + } + public function getOptions($subid = null) { - $this->_fetchOptions(); if ($subid == null) { + $this->_fetchOptions(); return $this->options; - } else if (array_key_exists($subid, $this->suboptions)) { - return $this->suboptions[$subid]; - } else { - return false; } + + $this->_fetchSubOptions($subid); + if (is_array($this->suboptions)) { + return $this->suboptions; + } + + return array(); } public function getOptionsIter($subid = null) @@ -414,17 +434,6 @@ abstract class DE_WithSuboption extends DirEnumeration } // }}} -// {{{ class DE_NameTypes -// returns 'system' names ('lastname', 'lastname_marital', ...) -class DE_NameTypes extends DirEnumeration -{ - public $capabilities = 0x005; // self::HAS_OPTIONS | self::SAVE_IN_SESSION; - - protected $from = 'profile_name_enum'; - protected $valfield = 'type'; -} -// }}} - /** GROUPS */ // {{{ class DE_Binets @@ -456,7 +465,7 @@ class DE_GroupesX extends DirEnumeration protected $from = 'groups'; protected $where = 'WHERE (cat = \'GroupesX\' OR cat = \'Institutions\') AND pub = \'public\''; - protected $ac_join = "INNER JOIN group_members ON (groups.id = memb.asso_id + protected $ac_join = "INNER JOIN group_members ON (groups.id = group_members.asso_id AND (groups.cat = 'GroupesX' OR groups.cat = 'Institutions') AND groups.pub = 'public')"; protected $ac_unique = 'group_members.uid'; @@ -468,6 +477,8 @@ class DE_GroupesX extends DirEnumeration // {{{ class DE_EducationSchools class DE_EducationSchools extends DirEnumeration { + protected $ac_beginwith = false; + protected $idfield = 'profile_education_enum.id'; protected $valfield = 'profile_education_enum.name'; protected $valfield2 = 'profile_education_enum.abbreviation'; protected $from = 'profile_education_enum'; @@ -478,7 +489,7 @@ class DE_EducationSchools extends DirEnumeration // }}} // {{{ class DE_EducationDegrees -class DE_EducationDegrees extends DirEnumeration +class DE_EducationDegrees extends DE_WithSuboption { public $capabilities = self::HAS_OPTIONS; @@ -502,14 +513,54 @@ class DE_EducationFields extends DirEnumeration } // }}} +// {{{ class DE_CurrentCorps +class DE_CurrentCorps extends DirEnumeration +{ + protected $idfield = 'profile_corps_enum.id'; + protected $valfield = 'profile_corps_enum.name'; + protected $valfield2 = 'profile_corps_enum.abbrev'; + protected $from = 'profile_corps_enum'; + protected $where = 'WHERE profile_corps_enum.still_exists = 1'; + + protected $ac_unique = 'profile_corps.pid'; + protected $ac_join = 'INNER JOIN profile_corps ON (profile_corps.current_corpsid = profile_corps_enum.id)'; +} +// }}} +// +// {{{ class DE_OriginCorps +class DE_OriginCorps extends DirEnumeration +{ + protected $idfield = 'profile_corps_enum.id'; + protected $valfield = 'profile_corps_enum.name'; + protected $valfield2 = 'profile_corps_enum.abbrev'; + protected $from = 'profile_corps_enum'; + + protected $ac_unique = 'profile_corps.pid'; + protected $ac_join = 'INNER JOIN profile_corps ON (profile_corps.original_corpsid = profile_corps_enum.id)'; +} +// }}} + +// {{{ class DE_CorpsRanks +class DE_CorpsRanks extends DirEnumeration +{ + protected $idfield = 'profile_corps_rank_enum.id'; + protected $valfield = 'profile_corps_rank_enum.name'; + protected $valfield2 = 'profile_corps_rank_enum.abbrev'; + protected $from = 'profile_corps_rank_enum'; + + protected $ac_unique = 'profile_corps.pid'; + protected $ac_join = 'INNER JOIN profile_corps ON (profile_corps.rankid = profile_corps_rank_enum.id)'; +} +// }}} + /** GEOLOC */ // {{{ class DE_Nationalities class DE_Nationalities extends DirEnumeration { protected $idfield = 'geoloc_countries.iso_3166_1_a2'; - protected $valfield = 'geoloc_countries.nationalityFR'; - protected $valfield2 = 'geoloc_countries.nationality'; + protected $valfield = 'geoloc_countries.nationality'; + protected $valfield2 = 'geoloc_countries.nationalityEn'; protected $from = 'geoloc_countries'; protected $join = 'INNER JOIN profiles ON (geoloc_countries.iso_3166_1_a2 IN (profiles.nationality1, profiles.nationality2, profiles.nationality3))'; @@ -518,41 +569,60 @@ class DE_Nationalities extends DirEnumeration } // }}} -// {{{ class DE_Countries -class DE_Countries extends DirEnumeration +// {{{ class DE_AddressesComponents +class DE_AddressesComponents extends DirEnumeration { - protected $idfield = 'geoloc_countries.iso_3166_1_a2'; - protected $valfield = 'geoloc_countries.countryFR'; - protected $valfield2 = 'geoloc_countries.country'; - protected $from = 'geoloc_countries'; + protected $idfield = 'profile_addresses_components_enum.id'; + protected $valfield = 'profile_addresses_components_enum.long_name'; + protected $from = 'profile_addresses_components_enum'; - protected $ac_join = 'INNER JOIN profile_addresses ON (geoloc_countries.iso_3166_1_a2 = profile_addresses.countryFR'; - protected $ac_unique = 'profile_addresses.pid'; + protected $ac_join = 'INNER JOIN profile_addresses_components ON (profile_addresses_components.component_id = profile_addresses_components_enum.id)'; + protected $ac_unique = 'profile_addresses_components.pid'; } // }}} +// {{{ class DE_AddressesComponents extensions +class DE_Countries extends DE_AddressesComponents +{ + protected $where = 'WHERE FIND_IN_SET(\'country\', profile_addresses_components_enum.types)'; + protected $ac_where = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'country\', profile_addresses_components_enum.types)'; +} -// {{{ class DE_AdminAreas -class DE_AdminAreas extends DE_WithSuboption +class DE_Admnistrativeareas1 extends DE_AddressesComponents { - protected $idfield = 'geoloc_administrativeareas.id'; - protected $optfield = 'geoloc_administrativeareas.country'; - protected $valfield = 'geoloc_administrativeareas.name'; - protected $from = 'geoloc_administrativeareas'; + protected $where = 'WHERE FIND_IN_SET(\'admnistrative_area_1\', profile_addresses_components_enum.types)'; + protected $ac_where = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_1\', profile_addresses_components_enum.types)'; +} - protected $ac_join = 'INNER JOIN profile_addresses ON (profile_addresses.administrativeAreaId = geoloc_administrativeareas.id)'; - protected $ac_unique = 'profile_addresses.pid'; +class DE_Admnistrativeareas2 extends DE_AddressesComponents +{ + protected $where = 'WHERE FIND_IN_SET(\'admnistrative_area_2\', profile_addresses_components_enum.types)'; + protected $ac_where = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_2\', profile_addresses_components_enum.types)'; +} + +class DE_Admnistrativeareas3 extends DE_AddressesComponents +{ + protected $where = 'WHERE FIND_IN_SET(\'admnistrative_area_3\', profile_addresses_components_enum.types)'; + protected $ac_where = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_3\', profile_addresses_components_enum.types)'; +} + +class DE_Localities extends DE_AddressesComponents +{ + protected $where = 'WHERE FIND_IN_SET(\'locality\', profile_addresses_components_enum.types)'; + protected $ac_where = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'locality\', profile_addresses_components_enum.types)'; } -// }}} -// {{{ class DE_Localities -class DE_Localities extends DirEnumeration +class DE_Sublocalities extends DE_AddressesComponents { - protected $valfield = 'geoloc_localities.name'; - protected $from = 'geoloc_localities'; + protected $where = 'WHERE FIND_IN_SET(\'sublocality\', profile_addresses_components_enum.types)'; + protected $ac_where = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'sublocality\', profile_addresses_components_enum.types)'; +} - protected $ac_join = 'profile_addresses ON (profile_addresses.localityID = geoloc_localities.id)'; - protected $ac_unique = 'profile_addresses.pid'; +class DE_Postalcodes extends DE_AddressesComponents +{ + protected $where = 'WHERE FIND_IN_SET(\'postal_code\', profile_addresses_components_enum.types)'; + protected $ac_where = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'postal_code\', profile_addresses_components_enum.types)'; } + // }}} /** JOBS @@ -560,6 +630,7 @@ class DE_Localities extends DirEnumeration // {{{ class DE_Companies class DE_Companies extends DirEnumeration { + protected $idfield = 'profile_job_enum.id'; protected $valfield = 'profile_job_enum.name'; protected $valfield2 = 'profile_job_enum.acronym'; protected $from = 'profile_job_enum'; @@ -569,19 +640,8 @@ class DE_Companies extends DirEnumeration } // }}} -// {{{ class DE_Sectors -class DE_Sectors extends DirEnumeration -{ - protected $valfield = 'profile_job_sector_enum.name'; - protected $from = 'profile_job_sector_enum'; - - protected $ac_join = 'INNER JOIN profile_job ON (profile_job_sector_enum.id = profile_job.sectorid)'; - protected $ac_unique = 'profile_job.pid'; -} -// }}} - // {{{ class DE_JobDescription -class DE_JobDescription +class DE_JobDescription extends DirEnumeration { protected $valfield = 'profile_job.description'; protected $from = 'profile_job'; @@ -591,20 +651,80 @@ class DE_JobDescription } // }}} +// {{{ class DE_JobTerms +class DE_JobTerms extends DirEnumeration +{ + // {{{ function getAutoComplete + public function getAutoComplete($text) + { + $tokens = JobTerms::tokenize($text.'%'); + if (count($tokens) == 0) { + return PlIteratorUtils::fromArray(array()); + } + $token_join = JobTerms::token_join_query($tokens, 'e'); + return XDB::iterator('SELECT e.jtid AS id, e.full_name AS field, COUNT(DISTINCT p.pid) AS nb + FROM profile_job_term_enum AS e + INNER JOIN profile_job_term_relation AS r ON (r.jtid_1 = e.jtid) + INNER JOIN profile_job_term AS p ON (r.jtid_2 = p.jtid) + '.$token_join.' + GROUP BY e.jtid + ORDER BY nb DESC, field + LIMIT ' . self::AUTOCOMPLETE_LIMIT); + } + // }}} +} +// }}} + /** NETWORKING */ // {{{ class DE_Networking class DE_Networking extends DirEnumeration { - protected $idfield = 'profile_networking_enum.network_type'; + protected $idfield = 'profile_networking_enum.nwid'; protected $valfield = 'profile_networking_enum.name'; protected $from = 'profile_networking_enum'; - protected $ac_join = 'INNER JOIN profile_networking ON (profile_networking.network_type = profile_networking_enum.network_type'; + protected $ac_join = 'INNER JOIN profile_networking ON (profile_networking.nwid = profile_networking_enum.nwid)'; protected $ac_unique = 'profile_networking.pid'; } // }}} +/** MEDALS + */ +// {{{ class DE_Medals +class DE_Medals extends DirEnumeration +{ + protected $from = 'profile_medal_enum'; + + protected $ac_join = 'INNER JOIN profile_medals ON (profile_medals.mid = profile_medal_enum.id)'; + protected $ac_unique = 'profile_medals.pid'; +} +// }}} + +/** ACCOUNTS + */ +// {{{ class DE_AccountTypes +class DE_AccountTypes extends DirEnumeration +{ + public $capabilities = 0x005; // self::HAS_OPTIONS | self::SAVE_IN_SESSION; + + protected $from = 'account_types'; + protected $valfield = 'perms'; + protected $idfield = 'type'; +} +// }}} + +// {{{ class DE_Skins +class DE_Skins extends DirEnumeration +{ + public $capabilities = 0x005; // self::HAS_OPTIONS | self::SAVE_IN_SESSION; + + protected $from = 'skins'; + protected $valfield = 'name'; + protected $idfield = 'skin_tpl'; +} +// }}} + // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>