Fixes bug in return of non-record XML response

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/RecordCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/RecordCommand.java
index 50e33d1..e9c4b54 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/RecordCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/RecordCommand.java
@@ -4,7 +4,7 @@ import org.apache.log4j.Logger;
 \r
 import com.indexdata.mkjsf.pazpar2.ClientCommandResponse;\r
 import com.indexdata.mkjsf.pazpar2.HttpResponseWrapper;\r
-import com.indexdata.mkjsf.pazpar2.Pz2Bean;\r
+import com.indexdata.mkjsf.pazpar2.Pz2Service;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.RecordCommandSp;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommand;\r
 import com.indexdata.mkjsf.pazpar2.data.RecordResponse;\r
@@ -24,34 +24,34 @@ public class RecordCommand extends Pazpar2Command implements ServiceProxyCommand
   public ResponseDataObject run() {\r
     ResponseDataObject responseObject = null;\r
     if (hasParameterValue("id")) {\r
-      HttpResponseWrapper commandResponse = Pz2Bean.get().getSearchClient().executeCommand(this);\r
+      HttpResponseWrapper commandResponse = Pz2Service.get().getSearchClient().executeCommand(this);\r
       \r
       if (commandResponse.getContentType().contains("xml")) {\r
         responseObject = ResponseParser.getParser().getDataObject((ClientCommandResponse)commandResponse);\r
         if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
           logger.debug("Storing " + responseObject.getType() + " in pzresp. ");\r
-        } else {        \r
+        } else {\r
           logger.debug("Command was 'record' but response not '<record>' - assuming raw record response.");\r
-          ResponseDataObject recordResponse = new RecordResponse(); \r
+          ResponseDataObject recordResponse = new RecordResponse();\r
           recordResponse.setType("record");\r
-          recordResponse.setXml(responseObject.getXml());          \r
-          recordResponse.setAttribute("activeclients", "0");             \r
+          recordResponse.setXml(responseObject.getXml());\r
+          recordResponse.setAttribute("activeclients", "0");\r
+          responseObject = recordResponse;\r
         }\r
       } else if (commandResponse.isBinary()) {\r
-        responseObject = new RecordResponse(); \r
+        responseObject = new RecordResponse();\r
         responseObject.setType(getCommandName());\r
         logger.info("Binary response");\r
         responseObject.setAttribute("activeclients", "0");\r
         responseObject.setXml("<record>binary response</record>");\r
         responseObject.setBinary(commandResponse.getBytes());\r
-        \r
       } else {\r
         logger.error("Response was not found to be XML or binary. The response was not handled.");\r
       }\r
-      Pz2Bean.get().getPzresp().put(getCommandName(), responseObject);\r
+      Pz2Service.get().getPzresp().put(getCommandName(), responseObject);\r
     } else {\r
       logger.debug("No record id parameter on this command. Ignoring request but clearing any previous record result.");\r
-      Pz2Bean.get().getPzresp().put(getCommandName(), new RecordResponse());\r
+      Pz2Service.get().getPzresp().put(getCommandName(), new RecordResponse());\r
     }\r
     return responseObject;\r
   }\r