Do record despite no previous search IF it has recordquery.

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
index 16b4319..6e74ed0 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
@@ -41,11 +41,23 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
                             + Utils.objectId(configurator) + "]" );    \r
       configureClient(searchClient,configurator);\r
       stateMgr.addStateListener(this);\r
+      serviceProxyUrl = searchClient.getConfiguration().get(ServiceProxyClient.SERVICE_PROXY_URL);\r
     } else {\r
       logger.debug("Pz2ProxyBean:postConstruct: searchClient already instantiated " +\r
                        "during construction of parent object Pz2Bean.");\r
     }\r
   }\r
+  \r
+  public void login(String un, String pw) {\r
+    if (user.isAuthenticated() && user.getName().equals(un) && ((ServiceProxyClient) searchClient).checkAuthentication(user)) {\r
+      logger.info("Repeat request from UI to authenticate user. Auth verified for given user name so skipping log-in.");\r
+    } else {\r
+      logger.info("doing un/pw login");\r
+      user.setName(un);\r
+      user.setPassword(pw);\r
+      login("dummy");\r
+    }\r
+  }\r
 \r
   @Override\r
   public String login(String navigateTo) {\r
@@ -56,6 +68,12 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
     pzresp.reset();\r
     return navigateTo;\r
   }\r
+  \r
+  public void ipAuthenticate (ServiceProxyUser user) {\r
+    if (!user.isAuthenticated()) {\r
+      ((ServiceProxyClient)searchClient).ipAuthenticate(user);\r
+    }\r
+  }\r
 \r
   @Override\r
   public void setServiceProxyUrl(String url) {\r
@@ -118,6 +136,4 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
     return null;\r
     // return getCommandParameterValue("record","acefilter","");\r
   }\r
-\r
-\r
 }\r