Moves more search and show methods

[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 277876b..00d587a 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -29,7 +29,9 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   private static Logger logger = Logger.getLogger(Pz2Bean.class);\r
   \r
   @Inject ConfigurationReader configurator;\r
-  protected Pz2Session pz2;  \r
+  \r
+  @Inject @ForStraightPz2 Pz2Session pz2;  \r
+  \r
   protected SearchClient searchClient;  \r
     \r
   public Pz2Bean () {\r
@@ -37,16 +39,15 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   }\r
   \r
   @PostConstruct\r
-  public void instantiatePz2SessionObject() {\r
-    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session next.");\r
-    pz2 = new Pz2Session();\r
+  public void instantiatePz2SessionObject() {    \r
+    logger.debug("in start of Pz2Bean post-construct configurator is " + configurator);\r
+    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Client next.");\r
     searchClient = new Pz2Client();\r
     logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" \r
                           + Utils.objectId(configurator) + "] on session [" \r
                           + Utils.objectId(pz2) + "]" );    \r
-    pz2.configureClient(searchClient,configurator);\r
-  }\r
-  \r
+    pz2.configureClient(searchClient,configurator);    \r
+  }  \r
   \r
   /* (non-Javadoc)\r
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch(java.lang.String)\r
@@ -59,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,108 +79,40 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   }\r
 \r
   /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setQuery(java.lang.String)\r
-   */\r
-  public void setQuery(String query) {\r
-    pz2.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 setTargetFilter(String targetId, String targetName) {\r
-    pz2.setTargetFilter(targetId, targetName);\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#removeTargetFilter()\r
-   */\r
-  public void removeTargetFilter () {\r
-    pz2.removeTargetFilter();\r
-  }\r
-\r
-  /* (non-Javadoc)\r
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTargetFilter()\r
    */\r
-  public TargetFilter getTargetFilter() {\r
-    return pz2.getTargetFilter();\r
-  }\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasTargetFilter()\r
-   */\r
-  public boolean hasTargetFilter() {\r
-    return pz2.hasTargetFilter();\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
+  public SingleTargetFilter getSingleTargetFilter() {\r
+    return pz2.getSingleTargetFilter();\r
   }\r
-\r
+  \r
   /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setPageSize(int)\r
+   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeTargetFilter()\r
    */\r
-  public void setPageSize(int perPageOption) {\r
-    pz2.setPageSize(perPageOption);\r
+  public void removeSingleTargetFilter () {\r
+    pz2.removeSingleTargetFilter();\r
   }\r
-\r
+  \r
   /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getPageSize()\r
+   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasTargetFilter()\r
    */\r
-  public int getPageSize() {\r
-    return pz2.getPageSize();\r
+  public boolean hasSingleTargetFilter() {\r
+    return pz2.hasSingleTargetFilter();\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
+  public String getFilter () {\r
+    return pz2.getFilter();\r
   }\r
   \r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getStart()\r
-   */\r
-  public int getStart() {\r
-    return pz2.getStart();\r
+  public void setFilter (String filterExpression) {\r
+    pz2.setFilter(filterExpression);\r
   }\r
   \r
   /* (non-Javadoc)\r
@@ -311,5 +244,5 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   public String getRecordId() {\r
     return pz2.getRecordId();\r
   }\r
-\r
+  \r
 }\r