Javadoc, and fixes some issues found along the way

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/CommandParameter.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/CommandParameter.java
index d08cde1..f14e836 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/CommandParameter.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/CommandParameter.java
@@ -161,9 +161,15 @@ public class CommandParameter implements Serializable {
   }\r
   \r
   public String getValueWithExpressions () {\r
-    StringBuilder completeValue = new StringBuilder((value==null ? "" : value));    \r
+    StringBuilder completeValue = new StringBuilder((value==null ? "" : value));\r
+    boolean first=true;\r
     for (Expression expr : expressions) {      \r
-      completeValue.append(" and " + expr.toString());\r
+      if (value == null && first) {\r
+        first = false;\r
+        completeValue.append(expr.toString());\r
+      } else {\r
+        completeValue.append(" AND " + expr.toString());\r
+      }\r
     }\r
     return completeValue.toString();    \r
   }  \r