X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FCommandParameter.java;h=b22962e46283a780f37962b06cb2ace8795ab35d;hb=4fb36567523ea8795fd610bfd92b991215439a65;hp=69c224a2550d1a833bbd5c0abff0c202303d1f73;hpb=ccb28ae8d5d46d29c40bd8b1637522c212b80636;p=mkjsf-moved-to-github.git

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 69c224a..b22962e 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/CommandParameter.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/CommandParameter.java
@@ -3,7 +3,9 @@ package com.indexdata.mkjsf.pazpar2.commands;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -14,19 +16,20 @@ public class CommandParameter implements Serializable {
 
   private static Logger logger = Logger.getLogger(CommandParameter.class);
   
-  private static final long serialVersionUID = 625502285668766749L;
+  private static final long serialVersionUID = 625502285668766749L;  
   String name = null;
   String operator = null;
   String value = null;
   Map<String,Expression> expressions = new HashMap<String,Expression>();
+  private static List<String> nologparams = Arrays.asList("password");
   
   public CommandParameter (String name) {
-    logger.debug("Instantiating command parameter '" + name + "'");
+    logger.trace("Instantiating command parameter '" + name + "'");
     this.name = name;
   }
   
   public CommandParameter (String name, String operator, String value, Expression... expressions) {
-    logger.debug("Instantiating command parameter " + name + " with expressions: [" + expressions + "]");
+    logger.trace("Instantiating command parameter " + name + " with expressions: [" + expressions + "]");
     this.name = name;
     this.operator = operator;
     this.value = value;
@@ -36,14 +39,14 @@ public class CommandParameter implements Serializable {
   }
 
   public CommandParameter (String name, String operator, String value) {
-    logger.debug("Instantiating command parameter '" + name + "' with String: [" + value + "]");
+    if (!nologparams.contains(name)) logger.trace("Instantiating command parameter '" + name + "' with String: [" + value + "]");    
     this.name = name;
     this.operator = operator;
     this.value = value;    
   }
   
   public CommandParameter (String name, String operator, int value) {
-    logger.debug("Instantiating command parameter '" + name + "' with int: [" + value + "]");
+    logger.trace("Instantiating command parameter '" + name + "' with int: [" + value + "]");
     this.name = name;
     this.operator = operator;
     this.value = value+"";    
@@ -72,6 +75,10 @@ public class CommandParameter implements Serializable {
     return operator != null;
   }
   
+  public boolean hasValue() {
+    return value != null && value.length()>0;
+  }
+  
   public String getEncodedQueryString () {
     try {
       return name + operator + URLEncoder.encode(getValueWithExpressions(),"UTF-8");
@@ -111,7 +118,7 @@ public class CommandParameter implements Serializable {
   }
   
   public CommandParameter copy() {
-    logger.debug("Copying parameter '"+ name + "' for modification");
+    logger.trace("Copying parameter '"+ name + "' for modification");
     CommandParameter newParam = new CommandParameter(name);
     newParam.value = this.value;
     newParam.operator = this.operator;