Moves filter settings from pz2 bean to search command

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

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
index 654f3c8..7c0cc86 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
@@ -160,30 +160,6 @@ public class Pz2Session implements Pz2Interface, StateListener {
     \r
   }\r
             \r
-  public void setSingleTargetFilter (String targetId, String targetName) {    \r
-    if (hasSingleTargetFilter(new SingleTargetFilter(targetId,targetName))) {\r
-      logger.debug("Already using target filter " + this.singleTargetFilter.getFilterExpression());\r
-    } else {      \r
-      this.singleTargetFilter = new SingleTargetFilter(targetId,targetName);\r
-      setCommandParameter("search",new CommandParameter("filter","=",this.singleTargetFilter.getFilterExpression()));      \r
-      doSearch();\r
-    }    \r
-  }\r
-\r
-  public SingleTargetFilter getSingleTargetFilter () {\r
-    return singleTargetFilter;\r
-  }\r
-    \r
-  public void removeSingleTargetFilter () {\r
-    logger.debug("Removing target filter " + singleTargetFilter.getFilterExpression());\r
-    this.singleTargetFilter = null;\r
-    removeCommandParameter("search","filter");         \r
-    doSearch();\r
-  }\r
-  \r
-  public boolean hasSingleTargetFilter() {\r
-    return singleTargetFilter != null;    \r
-  }\r
                     \r
   public String toggleRecord (String recId) {\r
     if (hasRecord(recId)) {\r
@@ -287,11 +263,6 @@ public class Pz2Session implements Pz2Interface, StateListener {
     error.setErrorHelper(errorHelper);\r
     return error;         \r
   }\r
-\r
-    \r
-  protected boolean hasSingleTargetFilter(SingleTargetFilter targetFilter) {\r
-    return hasSingleTargetFilter() && targetFilter.equals(this.singleTargetFilter);\r
-  }\r
   \r
   protected boolean hasQuery() {    \r
     return req.getSearch().getParameter("query") != null && req.getSearch().getParameter("query").getValueWithExpressions().length()>0;\r
@@ -437,19 +408,6 @@ public class Pz2Session implements Pz2Interface, StateListener {
     dataObjects.put("search", new SearchResponse());\r
   }\r
   \r
-  @Override\r
-  public void setFilter(String filterExpression) {\r
-    logger.debug("Setting filter to " + filterExpression);\r
-    setCommandParameter("search",new CommandParameter("filter","=",filterExpression));    \r
-  }\r
-  \r
-  public String getFilter() {\r
-    return getCommandParameterValue("search", "filter", "");\r
-  }\r
-  \r
-  public boolean hasFilter () {\r
-    return getFilter().length()>0;\r
-  }\r
 \r
   @Override\r
   public void stateUpdated(String commandName) {\r