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
Adds filter attribute, renames target id filter attribute
[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
..
72dbccb
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
\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
import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
\r
import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyClient;
\r
import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyInterface;
\r
@@
-50,6
+51,7
@@
public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
\r
@Override
\r
public void setInitFileName(String fileName) {
\r
\r
@Override
\r
public void setInitFileName(String fileName) {
\r
+ logger.info("Setting init file name: " + fileName);
\r
session().setInitFileName(fileName);
\r
}
\r
\r
session().setInitFileName(fileName);
\r
}
\r
\r
@@
-57,15
+59,26
@@
public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
public String getInitFileName() {
\r
return session().getInitFileName();
\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
\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
@Override
\r
public void setServiceProxyUrl(String url) {
\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
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
@@
-81,5
+94,13
@@
public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
public String getInitResponse() {
\r
return session().getInitResponse();
\r
}
\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
\r
}
\r