X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FLimitParameter.java;h=9a11143b21c7b7184d088073898078ddb5310226;hb=1e8b64ac581cdc14d250c299347a628a5b57813b;hp=0b989565c9d85b6b193e4fc2771d1c383087ca7d;hpb=969f879c807d127cbf47c5656771fcf5adc27a02;p=mkjsf-moved-to-github.git diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/LimitParameter.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/LimitParameter.java index 0b98956..9a11143 100644 --- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/LimitParameter.java +++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/LimitParameter.java @@ -31,17 +31,14 @@ public class LimitParameter extends CommandParameter { completeValue.append(","); else first=false; - completeValue.append(pz2escape(expr.toString())); + completeValue.append(expr.getField() + expr.getOperator() + expr.getValue()); logger.trace("valueWithExpressions so far: [" + completeValue + "]"); } return completeValue.toString(); } - - private String pz2escape (String expressionString) { - String escaped = expressionString.replaceAll("\\\\","\\\\\\\\"); - escaped = escaped.replaceAll(",","\\\\,"); - escaped = escaped.replaceAll("\\|", "\\\\|"); - return escaped; + + private String pz2escape (String str) { + return str.replaceAll("[~|,=\\\\]","\\\\$0"); }