Fixes scope for sp session bean. Fixes log statements.

[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 72dbccb..ae742f3 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
@@ -13,6 +13,7 @@ import org.apache.log4j.Logger;
 \r
 import com.indexdata.pz2utils4jsf.config.Configuration;\r
 import com.indexdata.pz2utils4jsf.config.ConfigurationReader;\r
+import com.indexdata.pz2utils4jsf.pazpar2.sp.ForServiceProxy;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyClient;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyInterface;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxySession;\r
@@ -26,15 +27,15 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   private static Logger logger = Logger.getLogger(Pz2ProxyBean.class);  \r
     \r
   @Inject ConfigurationReader configurator;\r
-  @Inject ServiceProxyUser user;\r
+  @Inject ServiceProxyUser user;  \r
+  @Inject @ForServiceProxy ServiceProxySession pz2;\r
   \r
   public Pz2ProxyBean() {\r
   }\r
   \r
   @PostConstruct\r
-  public void instantiatePz2SessionObject() {\r
-    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session object next.");\r
-    pz2 = new ServiceProxySession();\r
+  public void instantiateServiceProxyClient() {\r
+    logger.debug(Utils.objectId(this) + " will instantiate a ServiceProxyClient next.");    \r
     searchClient = new ServiceProxyClient();\r
     logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" \r
                           + Utils.objectId(configurator) + "] on session [" \r
@@ -45,7 +46,10 @@ 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
@@ -74,11 +78,20 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
     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
     logger.info("Setting Service Proxy url: " + url);\r
-    session().setServiceProxyUrl(url);    \r
+    session().setServiceProxyUrl(url); \r
+    session().setQuery(null);\r
+    session().resetDataObjects();\r
   }\r
 \r
   @Override\r