Moves filter settings from pz2 bean to search command

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

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
index 5838626..845f3d9 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -14,7 +14,6 @@ import org.apache.log4j.Logger;
 import com.indexdata.pz2utils4jsf.config.ConfigurationReader;\r
 import com.indexdata.pz2utils4jsf.controls.ResultsPager;\r
 import com.indexdata.pz2utils4jsf.errors.ErrorInterface;\r
-import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.RecordResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;\r
@@ -61,7 +60,7 @@ public class Pz2Bean implements Pz2Interface, Serializable {
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch()\r
    */\r
   public void doSearch() {\r
-    logger.info(Utils.objectId(this) + " doing search for "+this.getQuery());\r
+    logger.info(Utils.objectId(this) + " doing search for "+pz2.getCommandReadOnly("search").getParameterValue("query"));\r
     pz2.doSearch();\r
   }\r
 \r
@@ -78,121 +77,6 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   public String update(String commands) {\r
     return pz2.update(commands);\r
   }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setQuery(java.lang.String)\r
-   */\r
-  public void setQuery(String query) {\r
-    pz2.req.getSearch().setQuery(query);\r
-  }\r
-    \r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getQuery()\r
-   */\r
-  public String getQuery() {\r
-    return pz2.getQuery();\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setFacet(java.lang.String, java.lang.String)\r
-   */\r
-  public void setFacet(String facetKey, String term) {\r
-    pz2.setFacet(facetKey, term);\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeFacet(java.lang.String, java.lang.String)\r
-   */\r
-  public void removeFacet(String facetKey, String term) {\r
-    pz2.removeFacet(facetKey, term);\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setFacetOnQuery(java.lang.String, java.lang.String)\r
-   */\r
-  public void setFacetOnQuery(String facetKey, String term) {\r
-    pz2.setFacetOnQuery(facetKey, term);\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setTargetFilter(java.lang.String, java.lang.String)\r
-   */\r
-  public void setSingleTargetFilter(String targetId, String targetName) {\r
-    pz2.setSingleTargetFilter(targetId, targetName);\r
-  }\r
-  \r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTargetFilter()\r
-   */\r
-  public SingleTargetFilter getSingleTargetFilter() {\r
-    return pz2.getSingleTargetFilter();\r
-  }\r
-  \r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeTargetFilter()\r
-   */\r
-  public void removeSingleTargetFilter () {\r
-    pz2.removeSingleTargetFilter();\r
-  }\r
-  \r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasTargetFilter()\r
-   */\r
-  public boolean hasSingleTargetFilter() {\r
-    return pz2.hasSingleTargetFilter();\r
-  }\r
-\r
-  \r
-  public String getFilter () {\r
-    return pz2.getFilter();\r
-  }\r
-  \r
-  public void setFilter (String filterExpression) {\r
-    pz2.setFilter(filterExpression);\r
-  }\r
-\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setSort(java.lang.String)\r
-   */\r
-  public void setSort(String sortOption) {\r
-    pz2.setSort(sortOption);\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getSort()\r
-   */\r
-  public String getSort() {\r
-    return pz2.getSort();\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setPageSize(int)\r
-   */\r
-  public void setPageSize(int perPageOption) {\r
-    pz2.setPageSize(perPageOption);\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getPageSize()\r
-   */\r
-  public int getPageSize() {\r
-    return pz2.getPageSize();\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setStart(int)\r
-   */\r
-  public void setStart(int start) {\r
-    pz2.setStart(start);\r
-  }\r
-  \r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getStart()\r
-   */\r
-  public int getStart() {\r
-    return pz2.getStart();\r
-  }\r
   \r
   /* (non-Javadoc)\r
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#toggleRecord(java.lang.String)\r
@@ -313,19 +197,5 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   public boolean hasConfigurationErrors() {\r
     return pz2.hasConfigurationErrors();\r
   }\r
-\r
-  @Override\r
-  public void setRecordId(String recId) {\r
-    pz2.setRecordId(recId);    \r
-  }\r
-\r
-  @Override\r
-  public String getRecordId() {\r
-    return pz2.getRecordId();\r
-  }\r
   \r
-  public Pazpar2Command getSearchCommand () {\r
-    return pz2.getCommand("search");\r
-  }\r
-\r
 }\r