Adds pazpar2 limit parameter delimiters to escape

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / pazpar2 / commands / LimitParameter.java

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 93a26fc..9a11143 100644 (file)
--- 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(",");\r
       else \r
         first=false;      \r
-      completeValue.append(expr.toString());\r
+      completeValue.append(expr.getField() + expr.getOperator() + expr.getValue());\r
       logger.trace("valueWithExpressions so far: [" + completeValue + "]");\r
     }\r
     return completeValue.toString();    \r
   }\r
-  \r
-  private String pz2escape (String expressionString) {\r
-    String escaped = expressionString.replaceAll("\\\\","\\\\\\\\");\r
-    escaped = escaped.replaceAll(",","\\\\,");\r
-    escaped = escaped.replaceAll("\\|", "\\\\|");\r
-    return escaped;\r
+    \r
+  private String pz2escape (String str) {\r
+    return str.replaceAll("[~|,=\\\\]","\\\\$0");\r
   }\r
 \r
   \r