X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2FPz2Bean.java;h=70dde9274a143c495b501ddf363bb45785f1258e;hb=33338bd223ec711264392b7768d89d0f3fbce677;hp=dff3142ef1ab0ede44b260076397acbe73956f82;hpb=5ce9f5404929b726668d3332c5bdba4dbd1d1d1f;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 dff3142..70dde92 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -5,12 +5,13 @@ 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;
@@ -21,30 +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 configurator;
-  @Inject SearchClient    searchClient;
+  @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();
+    searchClient = new Pz2Client();
     logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" 
                           + Utils.objectId(configurator) + "] on session [" 
-                          + Utils.objectId(pz2) + "]" );
-    pz2.init(searchClient,configurator);
+                          + Utils.objectId(pz2) + "]" );    
+    pz2.configureClient(searchClient,configurator);
   }
   
+  
   /* (non-Javadoc)
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch(java.lang.String)
    */
@@ -112,31 +115,41 @@ 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)
    */
@@ -178,7 +191,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)
    */
@@ -299,4 +312,14 @@ public class Pz2Bean implements Pz2Interface, Serializable {
     return pz2.hasConfigurationErrors();
   }
 
+  @Override
+  public void setRecordId(String recId) {
+    pz2.setRecordId(recId);    
+  }
+
+  @Override
+  public String getRecordId() {
+    return pz2.getRecordId();
+  }
+
 }