X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2FPz2Bean.java;h=7f3ae52918e0f82b362eac1af853b23b41d07248;hb=a78346a10c75cd39bd0009517aebabc73871e2c3;hp=e5cfb1ca4190881c5adb65fef0ffc3ead9283998;hpb=17d3168e6fec9a87936aee992ac1a5deaad49cfe;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 e5cfb1c..7f3ae52 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -5,44 +5,53 @@ 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.Pz2Configurator;
+import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
 import com.indexdata.pz2utils4jsf.controls.ResultsPager;
+import com.indexdata.pz2utils4jsf.errors.ErrorInterface;
 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;
   private static Logger logger = Logger.getLogger(Pz2Bean.class);
   
-  Pz2Session pz2;  
-  @Inject Pz2Configurator pz2conf;
-  
+  @Inject ConfigurationReader configurator;
+  protected Pz2Session pz2;  
+  protected SearchClient searchClient;  
+    
   public Pz2Bean () {
-    logger.debug("Instantiating pz2 bean");      
-    pz2 = new Pz2Session();    
+    logger.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]");
   }
   
   @PostConstruct
-  public void initiatePz2Session() {
-    pz2.init(pz2conf);
+  public void instantiatePz2SessionObject() {
+    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session next.");
+    pz2 = new Pz2Session();
+    searchClient = new Pz2Client();
+    logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" 
+                          + Utils.objectId(configurator) + "] on session [" 
+                          + Utils.objectId(pz2) + "]" );    
+    pz2.configureClient(searchClient,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);
   }
 
@@ -50,6 +59,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();
   }
 
@@ -269,5 +279,27 @@ 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();
+  }
 
 }