From d9bf0fe0128ca38adcfdbc8ae4808a5a91ddd649 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 11 Feb 2020 16:02:55 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B02746=20-=20Fix=20breadcrumb=20for=20sear?= =?UTF-8?q?ch=20of=20enumSet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criterionconversion/criteriontooql.class.inc.php | 2 +- test/application/search/CriterionConversionTest.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php index 38e8e1af7..0c70778d2 100644 --- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php +++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php @@ -203,7 +203,7 @@ class CriterionToOQL extends CriterionConversionAbstract // This allow to search for complete words if (!empty($aRawValues)) { - $sValue = '"'.implode('" "', $aRawValues).'" _'; + $sValue = implode(' ', $aRawValues).' _'; } else { diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php index e06e6bfca..5ba4c7cbb 100644 --- a/test/application/search/CriterionConversionTest.php +++ b/test/application/search/CriterionConversionTest.php @@ -468,18 +468,18 @@ class CriterionConversionTest extends ItopDataTestCase 'ExpectedCriterion' => array(array('widget' => 'hierarchical_key')), ), 'IP range' => array( - 'OQL' => "SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(dev.managementip) < INET_ATON('10.22.32.255')", - 'ExpectedOQL' => "SELECT `dev` FROM DatacenterDevice AS `dev` WHERE ((INET_ATON(`dev`.`managementip`) < INET_ATON('10.22.32.255')) AND (INET_ATON(`dev`.`managementip`) > INET_ATON('10.22.32.224')))", + 'OQL' => "SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip_id_friendlyname) > INET_ATON('10.22.32.224') AND INET_ATON(dev.managementip_id_friendlyname) < INET_ATON('10.22.32.255')", + 'ExpectedOQL' => "SELECT `dev` FROM DatacenterDevice AS `dev` WHERE ((INET_ATON(`dev`.`managementip_id_friendlyname`) < INET_ATON('10.22.32.255')) AND (INET_ATON(`dev`.`managementip_id_friendlyname`) > INET_ATON('10.22.32.224')))", 'ExpectedCriterion' => array(array('widget' => 'raw')), ), 'TagSet Matches' => array( 'OQL' => "SELECT ".TAG_CLASS." WHERE ".TAG_ATTCODE." MATCHES 'tag1'", - 'ExpectedOQL' => "SELECT `".TAG_CLASS."` FROM ".TAG_CLASS." AS `".TAG_CLASS."` WHERE `".TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'\"tag1\" _\'', + 'ExpectedOQL' => "SELECT `".TAG_CLASS."` FROM ".TAG_CLASS." AS `".TAG_CLASS."` WHERE `".TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'tag1 _\'', 'ExpectedCriterion' => array(array('widget' => 'tag_set')), ), 'TagSet Matches2' => array( 'OQL' => "SELECT ".TAG_CLASS." WHERE ".TAG_ATTCODE." MATCHES 'tag1 tag2'", - 'ExpectedOQL' => "SELECT `".TAG_CLASS."` FROM ".TAG_CLASS." AS `".TAG_CLASS."` WHERE `".TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'\"tag1\" \"tag2\" _\'', + 'ExpectedOQL' => "SELECT `".TAG_CLASS."` FROM ".TAG_CLASS." AS `".TAG_CLASS."` WHERE `".TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'tag1 tag2 _\'', 'ExpectedCriterion' => array(array('widget' => 'tag_set')), ), 'TagSet Undefined' => array( @@ -489,12 +489,12 @@ class CriterionConversionTest extends ItopDataTestCase ), 'TagSet Undefined and tag' => array( 'OQL' => "SELECT ".TAG_CLASS." WHERE (((".TAG_ATTCODE." MATCHES 'tag1 tag2') OR (".TAG_ATTCODE." = '')) AND 1)", - 'ExpectedOQL' => "SELECT `".TAG_CLASS."` FROM ".TAG_CLASS." AS `".TAG_CLASS."` WHERE ((`".TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'\"tag1\" \"tag2\" _\' OR (`'.TAG_CLASS."`.`".TAG_ATTCODE."` = '')) AND 1)", + 'ExpectedOQL' => "SELECT `".TAG_CLASS."` FROM ".TAG_CLASS." AS `".TAG_CLASS."` WHERE ((`".TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'tag1 tag2 _\' OR (`'.TAG_CLASS."`.`".TAG_ATTCODE."` = '')) AND 1)", 'ExpectedCriterion' => array(array('widget' => 'tag_set')), ), 'TagSet equals' => array( 'OQL' => "SELECT ".TAG_CLASS." WHERE ".TAG_ATTCODE." = 'tag1 tag2'", - 'ExpectedOQL' => "SELECT `".TAG_CLASS."` FROM ".TAG_CLASS." AS `".TAG_CLASS."` WHERE (`".TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'\"tag1\" _\' AND `'.TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'\"tag2\" _\')', + 'ExpectedOQL' => "SELECT `".TAG_CLASS."` FROM ".TAG_CLASS." AS `".TAG_CLASS."` WHERE (`".TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'tag1 _\' AND `'.TAG_CLASS."`.`".TAG_ATTCODE.'` MATCHES \'tag2 _\')', 'ExpectedCriterion' => array(array('widget' => 'tag_set')), ),