Rearranges pz2/sp client logic to isolate error messaging

[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 ba2f0d7..f0cfa7d 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -132,10 +132,10 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
             }\r
           }\r
           for (CommandThread thread : threadList) {\r
-             String commandName = thread.getCommand().getName();\r
-             String response = thread.getResponse();\r
-             responseLogger.debug("Response was: " + response);\r
-             Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response);\r
+             String commandName = thread.getCommand().getCommandName();\r
+             CommandResponse 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
                pzresp.put(commandName, responseObject);\r
              } else {\r
@@ -174,6 +174,9 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
     } catch (NullPointerException npe) {\r
       npe.printStackTrace();\r
       return "";\r
+    } catch (Exception e) {\r
+      e.printStackTrace();\r
+      return "";\r
     }\r
     \r
   }\r