X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FPz2ProxyBean.java;h=751e9198071e6ff0e4e58367eb6057d03e7d468f;hb=28f8fc1f7a9c010900f73c3f6f95066471e21aee;hp=6e74ed03700456d3b57bcef28553bd9fb48d5634;hpb=d12251cb80269a1a0c084de5be88e616009e6563;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
index 6e74ed0..751e919 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2ProxyBean.java
@@ -24,7 +24,6 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   private static Logger logger = Logger.getLogger(Pz2ProxyBean.class);  
   private String initDocFileName = "";
   private String initDocResponse = "";
-  private String serviceProxyUrl = "";  
     
   @Inject ConfigurationReader configurator;
   @Inject ServiceProxyUser user;    
@@ -40,8 +39,7 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
       logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" 
                             + Utils.objectId(configurator) + "]" );    
       configureClient(searchClient,configurator);
-      stateMgr.addStateListener(this);
-      serviceProxyUrl = searchClient.getConfiguration().get(ServiceProxyClient.SERVICE_PROXY_URL);
+      stateMgr.addStateListener(this);      
     } else {
       logger.debug("Pz2ProxyBean:postConstruct: searchClient already instantiated " +
       		        "during construction of parent object Pz2Bean.");
@@ -77,15 +75,18 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
 
   @Override
   public void setServiceProxyUrl(String url) {
-    logger.info("Setting Service Proxy url: " + url);
-    serviceProxyUrl = url;
-    pzreq.getRecord().removeParametersInState();
-    pzreq.getSearch().removeParametersInState();
-    pzresp.reset();
+    logger.info("Setting Service Proxy url: " + url);    
+    if (url!=null & !url.equals(((ServiceProxyClient)searchClient).getServiceProxyUrl())) {
+      pzreq.getRecord().removeParametersInState();
+      pzreq.getSearch().removeParametersInState();
+      pzresp.reset();
+      user.clear();
+      ((ServiceProxyClient)searchClient).setServiceProxyUrl(url);
+    }    
   }
   
   public String getServiceProxyUrl() {
-    return serviceProxyUrl;
+    return ((ServiceProxyClient)searchClient).getServiceProxyUrl();
   }
     
   public String getInitDocPath () {
@@ -128,12 +129,4 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
     return initDocResponse;
   }
   
-  public void setAceFilter(String filterExpression) {
-    //setCommandParameter("record",new CommandParameter("acefilter","=",filterExpression));
-  }
-  
-  public String getAceFilter () {
-    return null;
-    // return getCommandParameterValue("record","acefilter","");
-  }
 }