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=a8d14cc8a4a6ef28ba7e730cb3d5c1820d7eeff4;hpb=aa4634e1a3c9eec2103b299dda20d916dcba8b20;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 a8d14cc..70dde92 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -37,14 +37,14 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   }
   
   @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);
+    pz2.configureClient(searchClient,configurator);
   }
   
   
@@ -115,30 +115,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)
@@ -181,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)
    */
@@ -302,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();
+  }
+
 }