Skip to content

changed code in order to avoid duplicated keywords #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fcogoni wants to merge 5 commits into
base: master
Choose a base branch
from
Open

changed code in order to avoid duplicated keywords #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2c13bf
updated SearchableTest
fcogoni Dec 14, 2011
35debbc
updated SearchableTest
fcogoni Dec 14, 2011
14b9ec4
changed code in order to avoid duplicated keywords
fcogoni Mar 27, 2012
e4a20ed
Updated searchable
fcogoni Jan 14, 2013
2e21e91
Updated the Searchable behavior
fcogoni Mar 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions extensions/data/behavior/Searchable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,18 @@ public static function bind($class, array $config = array()) {
$params['options']['conditions'] = array();
}
if (count($search) > 1) {
$params['options']['conditions'] += array(
'$' . $method => array_map(function($term){
return array('_keywords' => array('like' => '/' . $term . '/'));
}, $search));
$search_regex_array = array();
foreach ($search as $p_q) {
array_push($search_regex_array, new \MongoRegex('/'.$p_q.'/i'));
}
$params['options']['conditions'] +=
array('_keywords' => array('$all' => $search_regex_array));

}
else {
$search_regex = new \MongoRegex('/'.$search[0].'/i');
$params['options']['conditions'] += array(
'_keywords' => array('like' => '/' . $search[0] . '/')
'_keywords' => array('$all' => array($search_regex))
);
}
return $params;
Expand Down Expand Up @@ -156,12 +160,19 @@ protected static function _save($class) {
}

for ($i=0; $i < count($keywords); $i++) {
if ($keywords[$i] == '') {
if (isset($keywords[$i]) && ($keywords[$i] == '')) {
unset($keywords[$i]);
}
}
}
$entity->_keywords = array_unique(array_map('strtolower', $keywords));


$new = array();
$keywords = array_unique($keywords);
foreach ($keywords as $key) {
array_push($new, $key);
}
$entity->_keywords = array_map('strtolower', $new);
$params['entity'] = $entity;
return $chain->next($self, $params, $chain);
});
Expand Down
6 changes: 5 additions & 1 deletion tests/cases/SearchableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function setUp(){
public function testInitiallyWorking() {

$user = UsersMock::create(array(
'name' => 'Ricky Macky'
'name' => 'Ricky Macky Ricky'
));
$this->assertTrue($user->save());

Expand All @@ -41,6 +41,10 @@ public function testInitiallyWorking() {
$users = UsersMock::search('all', array('q'=>'boo hoo'));
$this->assertEqual(0, count($users));

$users = UsersMock::search('first', array('q'=>'Ricky'));
$this->assertEqual(2, count($users[0]->_keywords));


UsersMock::remove();

$user = UsersMock::create(array(
Expand Down