X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FPazpar2Command.java;fp=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FPazpar2Command.java;h=8176512bcccdf1d1548103b70a26e724ee6fa54e;hb=2816078831605dbc1c18147760e1212dd30909a8;hp=871eb3048b552da0918672926f45d94395070496;hpb=28f8fc1f7a9c010900f73c3f6f95066471e21aee;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
index 871eb30..8176512 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
@@ -83,14 +83,16 @@ public abstract class Pazpar2Command implements Serializable  {
     return (parameters.keySet().size()>0);
   }
   
-  public boolean hasParameterSet(String parameterName) {
-    return (parameters.get(parameterName) != null);
+  public boolean hasParameterValue(String parameterName) {
+    return (parameters.get(parameterName) != null && parameters.get(parameterName).hasValue());
   }
   
   public String getEncodedQueryString () {
     StringBuilder queryString = new StringBuilder("command="+name);
     for (CommandParameter parameter : parameters.values()) {
-       queryString.append("&"+parameter.getEncodedQueryString());       
+      if (parameter.hasValue()) {
+        queryString.append("&"+parameter.getEncodedQueryString());
+      }
     }
     return queryString.toString();
   } 
@@ -98,7 +100,9 @@ public abstract class Pazpar2Command implements Serializable  {
   public String getValueWithExpressions() {    
     StringBuilder value = new StringBuilder("");
     for (CommandParameter parameter : parameters.values()) {
-      value.append("&" + parameter.getName() + parameter.operator + parameter.getValueWithExpressions());       
+      if (parameter.hasValue()) {
+        value.append("&" + parameter.getName() + parameter.operator + parameter.getValueWithExpressions());
+      }
    }
     return value.toString();
   }