X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2FPz2Bean.java;h=345f049285a4d0c2410a10d56e800a38339cebe8;hb=977e4983e28683dd8a7d9fd19b0daee3ac349a3a;hp=73042fb7aea74a10d23780d4a557678fb4118b66;hpb=1724e77234e35c61de392b943730b76771ce5bb3;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
index 73042fb..345f049 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -3,34 +3,60 @@ package com.indexdata.pz2utils4jsf.pazpar2;
 import java.io.Serializable;
 import java.util.List;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Alternative;
+import javax.inject.Inject;
 import javax.inject.Named;
 
+import org.apache.log4j.Logger;
+
+import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
 import com.indexdata.pz2utils4jsf.controls.ResultsPager;
-import com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface;
-import com.indexdata.pz2utils4jsf.pazpar2.Pz2Session;
-import com.indexdata.pz2utils4jsf.pazpar2.TargetFilter;
+import com.indexdata.pz2utils4jsf.errors.ErrorInterface;
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;
 import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;
 import com.indexdata.pz2utils4jsf.pazpar2.data.RecordResponse;
 import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;
 import com.indexdata.pz2utils4jsf.pazpar2.data.StatResponse;
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;
+import com.indexdata.pz2utils4jsf.utils.Utils;
 
-@Named("pz2")
-@SessionScoped
+@Named("pz2") @SessionScoped @Alternative
 public class Pz2Bean implements Pz2Interface, Serializable {
 
   private static final long serialVersionUID = 3440277287081557861L;
-  Pz2Session pz2;
+  private static Logger logger = Logger.getLogger(Pz2Bean.class);
+  
+  @Inject ConfigurationReader configurator;
+  
+  @Inject @ForStraightPz2 Pz2Session pz2;  
   
+  protected SearchClient searchClient;  
+    
   public Pz2Bean () {
-    pz2 = new Pz2Session();    
+    logger.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]");
+    logger.debug("in Pz2Bean configurator is " + configurator);
   }
+  
+  @PostConstruct
+  public void instantiatePz2SessionObject() {    
+    logger.debug("in start of Pz2Bean post-construct configurator is " + configurator);
+    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session next.");
+    searchClient = new Pz2Client();
+    logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" 
+                          + Utils.objectId(configurator) + "] on session [" 
+                          + Utils.objectId(pz2) + "]" );    
+    pz2.configureClient(searchClient,configurator);    
+    logger.debug("in end of Pz2Bean post-construct configurator is " + configurator);
+
+  }  
+  
   /* (non-Javadoc)
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch(java.lang.String)
    */
-  public void doSearch(String query) {
+  public void doSearch(String query) {    
     pz2.doSearch(query);
   }
 
@@ -38,6 +64,7 @@ public class Pz2Bean implements Pz2Interface, Serializable {
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch()
    */
   public void doSearch() {
+    logger.info(Utils.objectId(this) + " doing search for "+this.getQuery());
     pz2.doSearch();
   }
 
@@ -59,9 +86,9 @@ public class Pz2Bean implements Pz2Interface, Serializable {
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setQuery(java.lang.String)
    */
   public void setQuery(String query) {
-    pz2.setQuery(query);
+    pz2.req.getSearch().setQuery(query);
   }
-
+    
   /* (non-Javadoc)
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getQuery()
    */
@@ -93,30 +120,40 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   /* (non-Javadoc)
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setTargetFilter(java.lang.String, java.lang.String)
    */
-  public void setTargetFilter(String targetId, String targetName) {
-    pz2.setTargetFilter(targetId, targetName);
+  public void setSingleTargetFilter(String targetId, String targetName) {
+    pz2.setSingleTargetFilter(targetId, targetName);
   }
   
   /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeTargetFilter()
+   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTargetFilter()
    */
-  public void removeTargetFilter () {
-    pz2.removeTargetFilter();
+  public SingleTargetFilter getSingleTargetFilter() {
+    return pz2.getSingleTargetFilter();
   }
-
+  
   /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTargetFilter()
+   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeTargetFilter()
    */
-  public TargetFilter getTargetFilter() {
-    return pz2.getTargetFilter();
+  public void removeSingleTargetFilter () {
+    pz2.removeSingleTargetFilter();
   }
-
+  
   /* (non-Javadoc)
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasTargetFilter()
    */
-  public boolean hasTargetFilter() {
-    return pz2.hasTargetFilter();
+  public boolean hasSingleTargetFilter() {
+    return pz2.hasSingleTargetFilter();
+  }
+
+  
+  public String getFilter () {
+    return pz2.getFilter();
   }
+  
+  public void setFilter (String filterExpression) {
+    pz2.setFilter(filterExpression);
+  }
+
 
   /* (non-Javadoc)
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setSort(java.lang.String)
@@ -159,7 +196,7 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   public int getStart() {
     return pz2.getStart();
   }
-
+  
   /* (non-Javadoc)
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#toggleRecord(java.lang.String)
    */
@@ -257,5 +294,41 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   public void setCurrentStateKey(String key) {
     pz2.setCurrentStateKey(key);    
   }
+  
+  public boolean hasErrors() {
+    return pz2.hasErrors();
+  }
+    
+  public ErrorInterface getCommandError() {
+    return pz2.getCommandError();
+  }
+  
+  public List<ErrorInterface> getConfigurationErrors () {
+    return pz2.getConfigurationErrors();
+  }
+
+  @Override
+  public boolean hasCommandErrors() {
+    return pz2.hasCommandErrors();
+  }
+
+  @Override
+  public boolean hasConfigurationErrors() {
+    return pz2.hasConfigurationErrors();
+  }
+
+  @Override
+  public void setRecordId(String recId) {
+    pz2.setRecordId(recId);    
+  }
+
+  @Override
+  public String getRecordId() {
+    return pz2.getRecordId();
+  }
+  
+  public Pazpar2Command getSearchCommand () {
+    return pz2.getCommand("search");
+  }
 
 }