X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2FPz2Bean.java;h=dcf75a7c46e96fb6417b98a9a10b0c2a401972eb;hb=2aa1c4adceb245c1f59f62e9adb77fda9f02291a;hp=c139786afd48d7ffbdd7e4ae4a34572b4d3245a2;hpb=f995bd0cb2162befcbeec565809566730a378641;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 c139786..dcf75a7 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -3,39 +3,49 @@ package com.indexdata.pz2utils4jsf.pazpar2;
 import java.io.Serializable;
 import java.util.List;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import com.indexdata.pz2utils4jsf.config.Pz2ConfigureByWebXml;
+import org.apache.log4j.Logger;
+
+import com.indexdata.pz2utils4jsf.config.Pz2Configurator;
 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.ApplicationError;
 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
 public class Pz2Bean implements Pz2Interface, Serializable {
 
   private static final long serialVersionUID = 3440277287081557861L;
-  Pz2Session pz2;
-
-  @Inject 
-  private Pz2ConfigureByWebXml pz2conf;
-
+  private static Logger logger = Logger.getLogger(Pz2Bean.class);
+  
+  Pz2Session pz2;  
+  @Inject Pz2Configurator pz2conf;
+  
   public Pz2Bean () {
-    pz2 = new Pz2Session(pz2conf);    
+    logger.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]");
   }
+  
+  @PostConstruct
+  public void initiatePz2Session() {
+    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);
+  }
+  
   /* (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);
   }
 
@@ -43,6 +53,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();
   }
 
@@ -262,5 +273,27 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   public void setCurrentStateKey(String key) {
     pz2.setCurrentStateKey(key);    
   }
+  
+  public boolean hasErrors() {
+    return pz2.hasErrors();
+  }
+    
+  public ApplicationError getCommandError() {
+    return pz2.getCommandError();
+  }
+  
+  public List<ApplicationError> getConfigurationErrors () {
+    return pz2.getConfigurationErrors();
+  }
+
+  @Override
+  public boolean hasCommandErrors() {
+    return pz2.hasCommandErrors();
+  }
+
+  @Override
+  public boolean hasConfigurationErrors() {
+    return pz2.hasConfigurationErrors();
+  }
 
 }