From f8eb20e07891203c7ac7c9fa460c6db930acd06a Mon Sep 17 00:00:00 2001 From: vlad Date: Wed, 25 Oct 2017 17:51:34 -0700 Subject: Fixing filters parsing for UUIDs --- .../scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/scala/xyz') diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala index 41533fe..a19945a 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala @@ -108,10 +108,9 @@ object SearchFilterParser { P((IgnoreCase("true") | IgnoreCase("false")).!.map(_.toBoolean)) private val binaryAtomParser: Parser[SearchFilterExpr.Atom.Binary] = P( - dimensionParser ~ whitespaceParser ~ ( - (numericOperatorParser.! ~ whitespaceParser ~ (longParser | booleanParser | numberParser.!)) | - (commonOperatorParser.! ~ whitespaceParser ~ AnyChar.rep(min = 1).!) - ) ~ End + dimensionParser ~ whitespaceParser ~ + ((numericOperatorParser.! ~ whitespaceParser ~ (longParser | booleanParser | numberParser.!) ~ End) | + (commonOperatorParser.! ~ whitespaceParser ~ AnyChar.rep(min = 1).! ~ End)) ).map { case BinaryAtomFromTuple(atom) => atom } -- cgit v1.2.3