Adds support for pazpar2 info command

[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 b86c27f..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
@@ -2,6 +2,14 @@ package com.indexdata.mkjsf.pazpar2.commands;
 \r
 import org.apache.log4j.Logger;\r
 \r
+/**\r
+ * Represents a limit parameter as it applies to the Pazpar2 search command\r
+ * \r
+ * <p>A limit parameter consists of one or more expressions separated by commas.</p> \r
+ *  \r
+ * @author Niels Erik\r
+ *\r
+ */\r
 public class LimitParameter extends CommandParameter {\r
 \r
   private static final long serialVersionUID = -1410691265213389826L;\r
@@ -23,17 +31,14 @@ public class LimitParameter extends CommandParameter {
         completeValue.append(",");\r
       else \r
         first=false;      \r
-      completeValue.append(pz2escape(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
-  public 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