projects
/
mkjsf-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moves single-target-filter class to commands package
[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
0f9e97d
..
15821ea
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,8
@@
import org.apache.log4j.Logger;
\r
import com.indexdata.pz2utils4jsf.config.Configuration;
\r
import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
\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
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
+28,15
@@
public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
private static Logger logger = Logger.getLogger(Pz2ProxyBean.class);
\r
\r
@Inject ConfigurationReader configurator;
\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
\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
searchClient = new ServiceProxyClient();
\r
logger.info("Using [" + Utils.objectId(searchClient) + "] configured by ["
\r
+ Utils.objectId(configurator) + "] on session ["
\r
@@
-45,7
+47,10
@@
public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
@Override
\r
public String login(String navigateTo) {
\r
logger.info("doing login");
\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
return session().login(navigateTo);
\r
}
\r
\r
@@
-86,7
+91,7
@@
public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
public void setServiceProxyUrl(String url) {
\r
logger.info("Setting Service Proxy url: " + url);
\r
session().setServiceProxyUrl(url);
\r
public void setServiceProxyUrl(String url) {
\r
logger.info("Setting Service Proxy url: " + url);
\r
session().setServiceProxyUrl(url);
\r
- session().setQuery(null);
\r
+ ((SearchCommand)session().getCommand("search")).setQuery(null);
\r
session().resetDataObjects();
\r
}
\r
\r
session().resetDataObjects();
\r
}
\r
\r