Temporary fix for multiple search terms being treated as one.

This commit is contained in:
Krazy
2014-08-19 21:24:36 +00:00
parent abed6a4024
commit 3f35cb25c3

View File

@@ -35,6 +35,8 @@ public class SFilterUtil {
return Predicates.alwaysTrue();
}
if (BooleanExpression.isExpression(text)) {
BooleanExpression expression = new BooleanExpression(text, inName, inType, inText, inCost);
Predicate<CardRules> filter = expression.evaluate();
@@ -42,6 +44,8 @@ public class SFilterUtil {
return Predicates.compose(invert ? Predicates.not(filter) : filter, PaperCard.FN_GET_RULES);
}
}
String[] splitText = text.replaceAll(",", "").replaceAll(" ", " ").split(" ");
List<Predicate<CardRules>> terms = new ArrayList<>();
@@ -123,6 +127,10 @@ public class SFilterUtil {
parse();
}
private static boolean isExpression(String text) {
return text.contains(Operation.AND.token) || text.contains(Operation.OR.token);
}
private void parse() {
Tokenizer tokenizer = new Tokenizer(text);