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=dcf75a7c46e96fb6417b98a9a10b0c2a401972eb;hpb=2aa1c4adceb245c1f59f62e9adb77fda9f02291a;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 dcf75a7..7f3ae52 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -5,14 +5,15 @@ 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.ApplicationError;
+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;
@@ -21,27 +22,32 @@ 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.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]");
   }
   
   @PostConstruct
-  public void initiatePz2Session() {
+  public void instantiatePz2SessionObject() {
     logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session next.");
     pz2 = new Pz2Session();
-    logger.debug(Utils.objectId(this) + " will forward configuration to the new Pz2Session [" + Utils.objectId(pz2) + "]");
-    pz2.init(pz2conf);
+    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)
    */
@@ -278,11 +284,11 @@ public class Pz2Bean implements Pz2Interface, Serializable {
     return pz2.hasErrors();
   }
     
-  public ApplicationError getCommandError() {
+  public ErrorInterface getCommandError() {
     return pz2.getCommandError();
   }
   
-  public List<ApplicationError> getConfigurationErrors () {
+  public List<ErrorInterface> getConfigurationErrors () {
     return pz2.getConfigurationErrors();
   }