1
0
mirror of synced 2025-01-18 06:21:40 +03:00
This commit is contained in:
zYne 2007-07-27 19:24:28 +00:00
parent 20ca9109aa
commit 201f821b27

View File

@ -49,9 +49,9 @@ class Doctrine_Search_Query
*/ */
public function __construct($table) public function __construct($table)
{ {
if (is_string($table)) { if (is_string($table)) {
$table = Doctrine_Manager::table($table); $table = Doctrine_Manager::table($table);
} }
$this->_table = $table; $this->_table = $table;
@ -69,7 +69,7 @@ class Doctrine_Search_Query
public function search($text) public function search($text)
{ {
$text = strtolower(trim($text)); $text = strtolower(trim($text));
$terms = Doctrine_Tokenizer::sqlExplode($text, ' AND ', '(', ')'); $terms = Doctrine_Tokenizer::sqlExplode($text, ' AND ', '(', ')');
@ -126,7 +126,7 @@ class Doctrine_Search_Query
} }
public function tokenizeClause($clause) public function tokenizeClause($clause)
{ {
$clause = Doctrine_Tokenizer::bracketTrim($clause); $clause = Doctrine_Tokenizer::bracketTrim($clause);
$terms = Doctrine_Tokenizer::sqlExplode($clause, ' ', '(', ')'); $terms = Doctrine_Tokenizer::sqlExplode($clause, ' ', '(', ')');
@ -162,47 +162,54 @@ class Doctrine_Search_Query
} }
return $ret; return $ret;
} }
public function parseClause($clause) public function parseClause($clause)
{ {
$clause = Doctrine_Tokenizer::bracketTrim($clause); $clause = Doctrine_Tokenizer::bracketTrim($clause);
$foreignId = current(array_diff($this->_table->getColumnNames(), array('keyword', 'field', 'position'))); $foreignId = current(array_diff($this->_table->getColumnNames(), array('keyword', 'field', 'position')));
$terms = Doctrine_Tokenizer::sqlExplode($clause, ' ', '(', ')'); $terms = $this->tokenizeClause($clause);
foreach ($terms as $k => $term) {
$terms[$k] = $term;
}
$terms = Doctrine_Tokenizer::sqlExplode($clause, ' AND ', '(', ')');
if (count($terms) > 1) { if (count($terms) > 1) {
$ret = array(); $ret = array();
foreach ($terms as $term) { foreach ($terms as $term) {
$parsed = $this->parseClause($term); if (is_array($term)) {
$parsed = $this->parseTerms($term);
} else {
$parsed = $this->parseClause($term);
}
$ret[] = $foreignId . ' IN (SELECT ' . $foreignId . ' FROM ' . $this->_table->getTableName() . ' WHERE ' . $parsed . ')'; $ret[] = $foreignId . ' IN (SELECT ' . $foreignId . ' FROM ' . $this->_table->getTableName() . ' WHERE ' . $parsed . ')';
} }
$r = implode(' AND ', $ret); $r = implode(' AND ', $ret);
} else { } else {
$terms = Doctrine_Tokenizer::sqlExplode($clause, ' OR ', '(', ')'); $terms = (is_array($terms[0])) ? $terms[0] : array($terms[0]);
if (count($terms) > 1) { return $this->parseTerms($terms);
$ret = array();
foreach ($terms as $term) {
$ret[] = $this->parseClause($term);
}
$r = implode(' OR ', $ret);
} else {
$ret = $this->parseTerm($clause);
return $ret[0];
}
} }
return $r; return $r;
} }
public function parseTerms(array $terms)
{
if (count($terms) > 1) {
$ret = array();
foreach ($terms as $term) {
$parsed = $this->parseClause($term);
if (strlen($parsed) > 20) {
$ret[] = '(' . $parsed. ')';
} else {
$ret[] = $parsed;
}
}
return implode(' OR ', $ret);
} else {
$ret = $this->parseTerm($terms[0]);
return $ret[0];
}
}
public function parseAndSeparatedTerms($terms, $foreignId) public function parseAndSeparatedTerms($terms, $foreignId)
{ {
$ret = array(); $ret = array();
@ -213,7 +220,7 @@ class Doctrine_Search_Query
$ret[] = $foreignId . ' IN (SELECT ' . $foreignId . ' FROM ' . $this->_table->getTableName() . ' WHERE ' . $parsed . ')'; $ret[] = $foreignId . ' IN (SELECT ' . $foreignId . ' FROM ' . $this->_table->getTableName() . ' WHERE ' . $parsed . ')';
} }
$r = implode(' AND ', $ret); $r = implode(' AND ', $ret);
} }
public function parseTerm($term) public function parseTerm($term)
{ {