X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2FPz2ProxyBean.java;h=6982f9c87059e7038b4eb9bff5fbe8d4cd99762a;hb=2e0ba76130e69557799700f32d437a72a34e7501;hp=f8d8d08a4e09d03259d1a7f8dfc472bde5a5b5c8;hpb=a78346a10c75cd39bd0009517aebabc73871e2c3;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
index f8d8d08..6982f9c 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
@@ -11,6 +11,7 @@ import javax.inject.Named;
 
 import org.apache.log4j.Logger;
 
+import com.indexdata.pz2utils4jsf.config.Configuration;
 import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyClient;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyInterface;
@@ -44,12 +45,16 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   @Override
   public String login(String navigateTo) {
     logger.info("doing login");
-    ((ServiceProxySession) pz2).setUser(user);
+    session().setUser(user);
+    session().resetDataObjects();
+    session().removeCommand("record");
+    session().setQuery(null);
     return session().login(navigateTo);
   }
 
   @Override
   public void setInitFileName(String fileName) {
+    logger.info("Setting init file name: " + fileName);
     session().setInitFileName(fileName);      
   }
 
@@ -57,15 +62,35 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   public String getInitFileName() {
     return session().getInitFileName();
   }
+  
+  public void setAceFilter (String filterExpression) {
+    session().setAceFilter(filterExpression);
+  }
+  
+  public String getAceFilter () {
+    return session().getAceFilter();
+  }
 
   @Override
   public String postInit() throws UnsupportedEncodingException, IOException {
-    return session().postInit();
+    logger.info("Posting init: " + System.currentTimeMillis());
+    session().postInit();
+    return "";
+  }
+  
+  public String postInit(byte[] initDoc) throws UnsupportedEncodingException, IOException {
+    logger.info("Posting init: " + System.currentTimeMillis());
+    session().postInit(initDoc);
+    return "";
+    
   }
 
   @Override
   public void setServiceProxyUrl(String url) {
-     session().setServiceProxyUrl(url);    
+    logger.info("Setting Service Proxy url: " + url);
+    session().setServiceProxyUrl(url); 
+    session().setQuery(null);
+    session().resetDataObjects();
   }
 
   @Override
@@ -81,5 +106,13 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   public String getInitResponse() {
     return session().getInitResponse();
   }
+  
+  public Configuration getClientConfiguration() {
+    return session().client().getConfiguration();
+  }
+  
+  public String getInitDocPath () {
+    return session().client().getConfiguration().get("INIT_DOC_PATH");
+  }
 
 }