RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-21 14:43:14 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-07-27 20:18:58 +00:00
parent 201f821b27
commit 5b611b5302
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/Doctrine/Search/Query.php
View File

@ -178,9 +178,18 @@ class Doctrine_Search_Query
if (is_array($term)) { if (is_array($term)) {
$parsed = $this->parseTerms($term); $parsed = $this->parseTerms($term);
} else { } else {
$parsed = $this->parseClause($term); if (strpos($term, '(') === false) {
$parsed = $foreignId . ' IN (SELECT ' . $foreignId . ' FROM ' . $this->_table->getTableName() . ' WHERE ' . $this->parseClause($term) . ')';
} else {
$parsed = $this->parseClause($term);
}
}
if (strlen($parsed) > 20) {
$ret[] = '(' . $parsed . ')';
} else {
$ret[] = $parsed;
} }
$ret[] = $foreignId . ' IN (SELECT ' . $foreignId . ' FROM ' . $this->_table->getTableName() . ' WHERE ' . $parsed . ')';
} }
$r = implode(' AND ', $ret); $r = implode(' AND ', $ret);
@ -193,35 +202,25 @@ class Doctrine_Search_Query
} }
public function parseTerms(array $terms) public function parseTerms(array $terms)
{ {
$foreignId = current(array_diff($this->_table->getColumnNames(), array('keyword', 'field', 'position')));
if (count($terms) > 1) { if (count($terms) > 1) {
$ret = array(); $ret = array();
foreach ($terms as $term) { foreach ($terms as $term) {
$parsed = $this->parseClause($term); $ret[] = $this->parseClause($term);
if (strlen($parsed) > 20) {
$ret[] = '(' . $parsed. ')';
} else {
$ret[] = $parsed;
}
} }
$parsed = implode(' OR ', $ret);
return implode(' OR ', $ret); if (strpos($parsed, '(') === false) {
$parsed = $foreignId . ' IN (SELECT ' . $foreignId . ' FROM ' . $this->_table->getTableName() . ' WHERE ' . $parsed . ')';
}
return $parsed;
} else { } else {
$ret = $this->parseTerm($terms[0]); $ret = $this->parseTerm($terms[0]);
return $ret[0]; return $ret[0];
} }
} }
public function parseAndSeparatedTerms($terms, $foreignId)
{
$ret = array();
foreach ($terms as $term) {
$parsed = $this->parseClause($term);
$ret[] = $foreignId . ' IN (SELECT ' . $foreignId . ' FROM ' . $this->_table->getTableName() . ' WHERE ' . $parsed . ')';
}
$r = implode(' AND ', $ret);
}
public function parseTerm($term) public function parseTerm($term)
{ {
if (strpos($term, "'") === false) { if (strpos($term, "'") === false) {