Fixes some log levels, typos.

[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..6185dae 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -25,9 +25,9 @@ import com.indexdata.mkjsf.errors.ErrorCentral;
 import com.indexdata.mkjsf.errors.ErrorHelper;\r
 import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;\r
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2ResponseData;\r
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2ResponseParser;\r
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2Responses;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
+import com.indexdata.mkjsf.pazpar2.data.Responses;\r
 import com.indexdata.mkjsf.pazpar2.data.RecordResponse;\r
 import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;\r
 import com.indexdata.mkjsf.pazpar2.state.StateListener;\r
@@ -58,7 +58,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   @Inject ConfigurationReader configurator;\r
   @Inject StateManager stateMgr;\r
   @Inject Pazpar2Commands pzreq;\r
-  @Inject Pazpar2Responses pzresp;\r
+  @Inject Responses pzresp;\r
   @Inject ErrorCentral errors;\r
   @Inject ServiceProxyUser user;\r
   \r
@@ -162,10 +162,10 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
           }\r
           for (CommandThread thread : threadList) {\r
              String commandName = thread.getCommand().getCommandName();\r
-             CommandResponse response = thread.getCommandResponse();\r
+             HttpResponseWrapper response = thread.getCommandResponse();\r
              responseLogger.debug("Response was: " + response.getResponseString());\r
-             Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response.getResponseString());\r
-             if (Pazpar2ResponseParser.docTypes.contains(responseObject.getType())) {\r
+             ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response.getResponseString());\r
+             if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
                pzresp.put(commandName, responseObject);\r
              } else {\r
                if (commandName.equals("record") && \r
@@ -190,7 +190,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
           return "0";\r
         }\r
       } else {\r
-        logger.error("Did not attemt to run command(s) due to a validation error.");\r
+        logger.debug("Did not attempt to run command(s) that were not ready.");\r
         return "0";\r
       }\r
     } else {      \r
@@ -213,7 +213,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   public boolean commandsAreValid(String commands) {\r
     if (commands.equals("record")) {\r
       if (!pzreq.getCommand("record").hasParameterValue("id")) {\r
-        logger.error("Attempt to send record command without the id parameter");\r
+        logger.debug("Attempt to send record command without the id parameter");\r
         return false;\r
       }\r
     }\r
@@ -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