Tweaks configuration, command responses, pz2/sp switching

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
index 490cee6..03bd096 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -295,20 +295,30 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   \r
   public void setServiceProxyUrl(String url) {\r
     searchClient = spClient;\r
+    setServiceType(SERVICE_TYPE_SP);\r
     setServiceUrl(url);\r
   }\r
   \r
   public String getServiceProxyUrl () {\r
-    return spClient.getServiceUrl();\r
+    if (isServiceProxyService()) {\r
+      return spClient.getServiceUrl();\r
+    } else {\r
+      return "";\r
+    }\r
   }\r
   \r
   public void setPazpar2Url(String url) {\r
     searchClient = pz2Client;\r
+    setServiceType(SERVICE_TYPE_PZ2);\r
     setServiceUrl(url);\r
   }\r
   \r
   public String getPazpar2Url() {\r
-    return pz2Client.getServiceUrl();\r
+    if (isPazpar2Service()) {\r
+      return pz2Client.getServiceUrl();\r
+    } else {\r
+      return "";\r
+    }\r
   }\r
 \r
   \r