Moves request logic from pz2bean to individual commands

[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 e52afac..50e33d1 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/RecordCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/RecordCommand.java
@@ -22,31 +22,37 @@ public class RecordCommand extends Pazpar2Command implements ServiceProxyCommand
   \r
   @Override\r
   public ResponseDataObject run() {\r
-    HttpResponseWrapper commandResponse = Pz2Bean.get().getSearchClient().executeCommand(this);\r
     ResponseDataObject responseObject = null;\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
-        logger.debug("Command was 'record' but response not '<record>' - assuming raw record response.");\r
-        ResponseDataObject recordResponse = new RecordResponse(); \r
-        recordResponse.setType("record");\r
-        recordResponse.setXml(responseObject.getXml());          \r
-        recordResponse.setAttribute("activeclients", "0");             \r
-      }\r
-    } else if (commandResponse.isBinary()) {\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
+    if (hasParameterValue("id")) {\r
+      HttpResponseWrapper commandResponse = Pz2Bean.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
+          logger.debug("Command was 'record' but response not '<record>' - assuming raw record response.");\r
+          ResponseDataObject recordResponse = new RecordResponse(); \r
+          recordResponse.setType("record");\r
+          recordResponse.setXml(responseObject.getXml());          \r
+          recordResponse.setAttribute("activeclients", "0");             \r
+        }\r
+      } else if (commandResponse.isBinary()) {\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
     } else {\r
-      logger.error("Response was not found to be XML or binary. The response was not handled.");\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
     }\r
-    Pz2Bean.get().getPzresp().put(getCommandName(), responseObject);\r
     return responseObject;\r
   }\r
   \r