\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.commands.SearchCommand;\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
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
@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
+ ((SearchCommand)session().getCommand("search")).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
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
+ ((SearchCommand)session().getCommand("search")).setQuery(null);\r
+ session().resetDataObjects();\r
}\r
\r
@Override\r
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