composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

#366 Global search case sensitive or not working at all (issue with COLLATION)

Browse Source 
SVN:trunk[1158]
This commit is contained in:
Romain Quetiez
2011-03-31 08:29:02 +00:00
parent e3ac7067f7
commit d4321ec1ce
4 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/metamodel.class.php
View File

@@ -2016,6 +2016,26 @@ abstract class MetaModel
$oQBExpr->AddSelect($sClassAlias.$sAttCode.$sColId, new FieldExpression($sAttCode.$sColId, $sClassAlias));
}
}
// Transform the full text condition into additional condition expression
$aFullText = $oFilter->GetCriteria_FullText();
if (count($aFullText) > 0)
{
$aFullTextFields = array();
foreach (self::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
{
if (!$oAttDef->IsScalar()) continue;
if ($oAttDef->IsExternalKey()) continue;
$aFullTextFields[] = new FieldExpression($sAttCode, $sClassAlias);
}
$oTextFields = new CharConcatWSExpression(' ', $aFullTextFields);
foreach($aFullText as $sFTNeedle)
{
$oNewCond = new BinaryExpression($oTextFields, 'LIKE', new ScalarExpression("%$sFTNeedle%"));
$oQBExpr->AddCondition($oNewCond);
}
}
}
$aExpectedAtts = array(); // array of (attcode => fieldexpression)
@@ -2281,22 +2301,9 @@ abstract class MetaModel
}
}
// #@# todo - See what a full text search condition should be
// 2 - WHERE / Full text search condition
//
if ($bIsOnQueriedClass)
{
$aFullText = $oFilter->GetCriteria_FullText();
}
else
{
// Pourquoi ???
$aFullText = array();
}
// 3 - The whole stuff, for this table only
//
$oSelectBase = new SQLQuery($sTable, $sTableAlias, array(), $aFullText, $bIsOnQueriedClass, $aUpdateValues, $oSelectedIdField);
$oSelectBase = new SQLQuery($sTable, $sTableAlias, array(), $bIsOnQueriedClass, $aUpdateValues, $oSelectedIdField);
// 4 - The external keys -> joins...
//