Adds some debug log statements for target filter

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
index 749742e..5e4e07b 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
@@ -150,13 +150,14 @@ public class SearchCommand extends Pazpar2Command {
     if (hasSingleTargetFilter(new SingleTargetFilter(targetId,targetName))) {\r
       logger.debug("Already using target filter " + this.singleTargetFilter.getFilterExpression());\r
     } else {      \r
+      logger.debug("Setting new single target filter for [" + targetName + "]");\r
       this.singleTargetFilter = new SingleTargetFilter(targetId,targetName);\r
       setParameter(new CommandParameter("filter","=",this.singleTargetFilter.getFilterExpression()));            \r
     }    \r
   }\r
 \r
   public SingleTargetFilter getSingleTargetFilter () {\r
-    logger.debug("request to get the current single target filter");\r
+    logger.debug("request to get the current single target filter " + singleTargetFilter);\r
     return singleTargetFilter;\r
   }\r
    \r
@@ -164,10 +165,11 @@ public class SearchCommand extends Pazpar2Command {
    * Removes the current target filter from the search\r
    * \r
    */\r
-  public void removeSingleTargetFilter () {\r
+  public String removeSingleTargetFilter () {\r
     logger.debug("Removing target filter " + singleTargetFilter.getFilterExpression());\r
     this.singleTargetFilter = null;\r
-    removeParameter("filter");             \r
+    removeParameter("filter");\r
+    return null;\r
   }\r
   \r
   /**\r
@@ -178,7 +180,7 @@ public class SearchCommand extends Pazpar2Command {
     logger.debug("Checking if a single target filter is set: " + (singleTargetFilter != null));\r
     return singleTargetFilter != null;    \r
   }\r
-\r
+  \r
   /**\r
    * Resolves if the current search command has a target filter - to\r
    * be used by the UI for conditional rendering of target filter info.\r
@@ -187,6 +189,7 @@ public class SearchCommand extends Pazpar2Command {
    * filter\r
    */\r
   protected boolean hasSingleTargetFilter(SingleTargetFilter targetFilter) {\r
+    logger.debug("Checking if target filter for [" + targetFilter.getTargetName() + "] is set.");\r
     return hasSingleTargetFilter() && targetFilter.equals(this.singleTargetFilter);\r
   }\r
     \r

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SingleTargetFilter.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SingleTargetFilter.java
index 4aea8a2..ef6303e 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SingleTargetFilter.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SingleTargetFilter.java
@@ -8,8 +8,8 @@ public class SingleTargetFilter implements Serializable {
 \r
   private static final long serialVersionUID = 2389085467202526537L;\r
 \r
-  private String targetName;\r
-  private String targetId;\r
+  private String targetName = "";\r
+  private String targetId = "";\r
   \r
   public SingleTargetFilter (String targetId, String targetName) {\r
     this.targetId = targetId;\r
@@ -43,5 +43,9 @@ public class SingleTargetFilter implements Serializable {
     return (targetId+targetName).hashCode();\r
   }\r
   \r
+  @Override\r
+  public String toString () {\r
+    return targetName + " (" + targetId + ")";\r
+  }\r
   \r
 }\r