Do some resetting of session on login

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / pz2utils4jsf / pazpar2 / Pz2ProxyBean.java

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 (file)
--- 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;
 \r
 import org.apache.log4j.Logger;\r
 \r
+import com.indexdata.pz2utils4jsf.config.Configuration;\r
 import com.indexdata.pz2utils4jsf.config.ConfigurationReader;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyClient;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyInterface;\r
@@ -44,12 +45,16 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   @Override\r
   public String login(String navigateTo) {\r
     logger.info("doing login");\r
-    ((ServiceProxySession) pz2).setUser(user);\r
+    session().setUser(user);\r
+    session().resetDataObjects();\r
+    session().removeCommand("record");\r
+    session().setQuery(null);\r
     return session().login(navigateTo);\r
   }\r
 \r
   @Override\r
   public void setInitFileName(String fileName) {\r
+    logger.info("Setting init file name: " + fileName);\r
     session().setInitFileName(fileName);      \r
   }\r
 \r
@@ -57,15 +62,35 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   public String getInitFileName() {\r
     return session().getInitFileName();\r
   }\r
+  \r
+  public void setAceFilter (String filterExpression) {\r
+    session().setAceFilter(filterExpression);\r
+  }\r
+  \r
+  public String getAceFilter () {\r
+    return session().getAceFilter();\r
+  }\r
 \r
   @Override\r
   public String postInit() throws UnsupportedEncodingException, IOException {\r
-    return session().postInit();\r
+    logger.info("Posting init: " + System.currentTimeMillis());\r
+    session().postInit();\r
+    return "";\r
+  }\r
+  \r
+  public String postInit(byte[] initDoc) throws UnsupportedEncodingException, IOException {\r
+    logger.info("Posting init: " + System.currentTimeMillis());\r
+    session().postInit(initDoc);\r
+    return "";\r
+    \r
   }\r
 \r
   @Override\r
   public void setServiceProxyUrl(String url) {\r
-     session().setServiceProxyUrl(url);    \r
+    logger.info("Setting Service Proxy url: " + url);\r
+    session().setServiceProxyUrl(url); \r
+    session().setQuery(null);\r
+    session().resetDataObjects();\r
   }\r
 \r
   @Override\r
@@ -81,5 +106,13 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   public String getInitResponse() {\r
     return session().getInitResponse();\r
   }\r
+  \r
+  public Configuration getClientConfiguration() {\r
+    return session().client().getConfiguration();\r
+  }\r
+  \r
+  public String getInitDocPath () {\r
+    return session().client().getConfiguration().get("INIT_DOC_PATH");\r
+  }\r
 \r
 }\r