X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fprofile.php;h=8eb66bbc6aa5e5b7cfbd8a88563b47f8c0294fb3;hb=4ad7b8ca262ce5badfff6d5f23deb091913f0606;hp=a74706364b337a23a0ef76dabea307de65119680;hpb=3ac45f10c6b54e4db4bfeb0aeb5eef0f5ee5d1b2;p=platal.git diff --git a/classes/profile.php b/classes/profile.php index a747063..8eb66bb 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -19,64 +19,6 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -class ProfileVisibility -{ - static private $v_values = array(self::VIS_PUBLIC => array(self::VIS_PUBLIC), - self::VIS_AX => array(self::VIS_AX, self::VIS_PUBLIC), - self::VIS_PRIVATE => array(self::VIS_PRIVATE, self::VIS_AX, self::VIS_PUBLIC)); - - const VIS_PUBLIC = 'public'; - const VIS_AX = 'ax'; - const VIS_PRIVATE = 'private'; - - private $level; - - public function __construct($level = null) - { - $this->setLevel($level); - } - - public function setLevel($level = self::VIS_PUBLIC) - { - if ($level != null && $level != self::VIS_PRIVATE && $level != self::VIS_AX && $level != self::VIS_PUBLIC) { - Platal::page()->kill("Invalid visibility: " . $level); - } - - if (!S::logged()) { - $level = self::VIS_PUBLIC; - } else if ($level == null) { - $level = self::VIS_PRIVATE; - } - - if ($this->level == null || $this->level == self::VIS_PRIVATE) { - $this->level = $level; - } else if ($this->level == self::VIS_AX && $level == self::VIS_PRIVATE) { - return; - } else { - $this->level = self::VIS_PUBLIC; - } - } - - public function level() - { - if ($this->level == null) { - return self::VIS_PUBLIC; - } else { - return $this->level; - } - } - - public function levels() - { - return self::$v_values[$this->level()]; - } - - public function isVisible($visibility) - { - return in_array($visibility, $this->levels()); - } -} - class Profile { @@ -152,7 +94,6 @@ class Profile const FETCH_JOBS = 0x000008; const FETCH_MEDALS = 0x000010; const FETCH_NETWORKING = 0x000020; - const FETCH_MENTOR_SECTOR = 0x000040; const FETCH_MENTOR_COUNTRY = 0x000080; const FETCH_PHONES = 0x000100; const FETCH_JOB_TERMS = 0x000200; @@ -481,10 +422,12 @@ class Profile $this->fetched_fields = $fields; } + /** Have we already fetched this field ? + */ private function fetched($field) { - if (($fields | self::FETCH_ALL) != self::FETCH_ALL) { - Platal::page()->kill("Invalid fetched fields: $fields"); + if (!array_key_exists($field, ProfileField::$fields)) { + Platal::page()->kill("Invalid field: $field"); } return ($this->fetched_fields & $field); @@ -514,6 +457,7 @@ class Profile */ private function consolidateFields() { + // Link phones to addresses if ($this->phones != null) { if ($this->addresses != null) { $this->addresses->addPhones($this->phones); @@ -524,9 +468,12 @@ class Profile } } + // Link addresses to jobs if ($this->addresses != null && $this->jobs != null) { $this->jobs->addAddresses($this->addresses); } + + // Link jobterms to jobs if ($this->jobs != null && $this->jobterms != null) { $this->jobs->addJobTerms($this->jobterms); } @@ -591,11 +538,15 @@ class Profile public function getMainAddress() { - $addr = $this->getAddresses(self::ADDRESS_PERSO | self::ADDRESS_MAIN); - if (count($addr) == 0) { - return null; + $main = $this->getAddresses(self::ADDRESS_MAIN); + $perso = $this->getAddresses(self::ADDRESS_PERSO); + + if (count($main)) { + return array_pop($main); + } else if (count($perso)) { + return array_pop($perso); } else { - return array_pop($addr); + return null; } } @@ -749,27 +700,6 @@ class Profile $this->consolidateFields(); } - /* Mentoring - */ - private $mentor_sectors = null; - public function setMentoringSectors(ProfileMentoringSectors $sectors) - { - $this->mentor_sectors = $sectors; - } - - public function getMentoringSectors() - { - if ($this->mentor_sectors == null && !$this->fetched(self::FETCH_MENTOR_SECTOR)) { - $this->setMentoringSectors($this->getProfileField(self::FETCH_MENTOR_SECTOR)); - } - - if ($this->mentor_sectors == null) { - return array(); - } else { - return $this->mentor_sectors->sectors; - } - } - private $mentor_countries = null; public function setMentoringCountries(ProfileMentoringCountries $countries) { @@ -1081,34 +1011,57 @@ class Profile } } - public static function rebuildSearchTokens($pid) + public static function rebuildSearchTokens($pids) { - XDB::execute('DELETE FROM search_name - WHERE pid = {?}', - $pid); - $keys = XDB::iterator("SELECT CONCAT(n.particle, n.name) AS name, e.score, - FIND_IN_SET('public', e.flags) AS public - FROM profile_name AS n - INNER JOIN profile_name_enum AS e ON (n.typeid = e.id) - WHERE n.pid = {?}", - $pid); - + if (!is_array($pids)) { + $pids = array($pids); + } + $keys = XDB::iterator("(SELECT n.pid AS pid, n.name AS name, e.score AS score, + IF(FIND_IN_SET('public', e.flags), 'public', '') AS public + FROM profile_name AS n + INNER JOIN profile_name_enum AS e ON (n.typeid = e.id) + WHERE n.pid IN {?} AND NOT FIND_IN_SET('not_displayed', e.flags)) + UNION + (SELECT n.pid AS pid, n.particle AS name, 0 AS score, + IF(FIND_IN_SET('public', e.flags), 'public', '') AS public + FROM profile_name AS n + INNER JOIN profile_name_enum AS e ON (n.typeid = e.id) + WHERE n.pid IN {?} AND NOT FIND_IN_SET('not_displayed', e.flags)) + ", + $pids, $pids); + $names = array(); while ($key = $keys->next()) { if ($key['name'] == '') { continue; } - $toks = preg_split('/[ \'\-]+/', $key['name']); + $pid = $key['pid']; + $toks = preg_split('/[ \'\-]+/', strtolower(replace_accent($key['name'])), + -1, PREG_SPLIT_NO_EMPTY); + $toks = array_reverse($toks); + + /* Split the score between the tokens to avoid the user to be over-rated. + * Let says my user name is "Machin-Truc Bidule" and I also have a user named + * 'Machin Truc'. Distributing the score force "Machin Truc" to be displayed + * before "Machin-Truc" for both "Machin Truc" and "Machin" searches. + */ + $eltScore = ceil(((float)$key['score'])/((float)count($toks))); $token = ''; - $first = 5; - while ($toks) { - $token = strtolower(replace_accent(array_pop($toks) . $token)); - $score = ($toks ? 0 : 10 + $first) * ($key['score'] / 10); - XDB::execute('REPLACE INTO search_name (token, pid, soundex, score, flags) - VALUES ({?}, {?}, {?}, {?}, {?})', - $token, $pid, soundex_fr($token), $score, $key['public']); - $first = 0; + foreach ($toks as $tok) { + $token = $tok . $token; + $names["$pid-$token"] = XDB::format('({?}, {?}, {?}, {?}, {?})', + $token, $pid, soundex_fr($token), + $eltScore, $key['public']); } } + XDB::startTransaction(); + XDB::execute('DELETE FROM search_name + WHERE pid IN {?}', + $pids); + if (count($names) > 0) { + XDB::rawExecute('INSERT INTO search_name (token, pid, soundex, score, flags) + VALUES ' . implode(', ', $names)); + } + XDB::commit(); } /** The school identifier consists of 6 digits. The first 3 represent the