mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
efa7a4ee55
* Add 'search_manual_submit' config parameter to manage auto-submit * bugfixes ** date i18n is now handled (using two new options `datepicker.dateFormat` and `datepicker.timeFormat` computed from `AttributeDateTime::GetFormat()->ToDatePicker()` ** handling of `empty` `not empty` operator titles *** it led to tohers bugfixes and a redesign of the `_computeTitle` (from overwriting to extension using ie `_computeBetweenDaysOperatorTitle` *** some bug still remain, because autocomplete needs to been finished before checking on them * Promote 'friendlyname' in the 'most popular' list * bugfixes ** filters (criterions, enum and FK without autocomplete) now ignore accent on matching with user input ** this is done by using a pre-existing tool used only by the portal, so it was moved to the core (latinize.min.js) * Integration with manual submit parameter on client side. * bugfixes : history/breadcrumb had several c[menu] appended (one for each refresh) * Fix various sanity bugs SVN:trunk[5632]
108 lines
2.3 KiB
PHP
108 lines
2.3 KiB
PHP
<?php
|
|
/**
|
|
* Copyright (C) 2010-2018 Combodo SARL
|
|
*
|
|
* This file is part of iTop.
|
|
*
|
|
* iTop is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* iTop is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Affero General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public License
|
|
* along with iTop. If not, see <http://www.gnu.org/licenses/>
|
|
*
|
|
*/
|
|
|
|
/**
|
|
* Created by PhpStorm.
|
|
* User: Eric
|
|
* Date: 08/03/2018
|
|
* Time: 11:25
|
|
*/
|
|
|
|
namespace Combodo\iTop\Application\Search;
|
|
|
|
|
|
use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
|
|
use DBObjectSearch;
|
|
use Expression;
|
|
use IssueLog;
|
|
use OQLException;
|
|
|
|
class CriterionParser
|
|
{
|
|
|
|
/**
|
|
* @param $sBaseOql
|
|
* @param $aCriterion
|
|
* @param $sHiddenCriteria
|
|
*
|
|
* @return \DBSearch
|
|
*/
|
|
public static function Parse($sBaseOql, $aCriterion, $sHiddenCriteria = null)
|
|
{
|
|
$aExpression = array();
|
|
$aOr = $aCriterion['or'];
|
|
foreach($aOr as $aAndList)
|
|
{
|
|
|
|
$sExpression = self::ParseAndList($aAndList['and']);
|
|
if (!empty($sExpression))
|
|
{
|
|
$aExpression[] = $sExpression;
|
|
}
|
|
}
|
|
|
|
try
|
|
{
|
|
$oSearch = DBObjectSearch::FromOQL($sBaseOql);
|
|
|
|
if (!empty($sHiddenCriteria))
|
|
{
|
|
$oHiddenCriteriaExpression = Expression::FromOQL($sHiddenCriteria);
|
|
$oSearch->AddConditionExpression($oHiddenCriteriaExpression);
|
|
}
|
|
|
|
if (empty($aExpression))
|
|
{
|
|
return $oSearch;
|
|
}
|
|
|
|
$oExpression = Expression::FromOQL(implode(" OR ", $aExpression));
|
|
$oSearch->AddConditionExpression($oExpression);
|
|
|
|
return $oSearch;
|
|
} catch (OQLException $e)
|
|
{
|
|
IssueLog::Error($e->getMessage());
|
|
}
|
|
return null;
|
|
}
|
|
|
|
private static function ParseAndList($aAnd)
|
|
{
|
|
$aExpression = array();
|
|
foreach($aAnd as $aCriteria)
|
|
{
|
|
|
|
$sExpression = CriterionToOQL::Convert($aCriteria);
|
|
if ($sExpression !== '1')
|
|
{
|
|
$aExpression[] = $sExpression;
|
|
}
|
|
}
|
|
|
|
if (empty($aExpression))
|
|
{
|
|
return '1';
|
|
}
|
|
|
|
return '('.implode(" AND ", $aExpression).')';
|
|
}
|
|
} |