X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FRecordCommand.java;h=e9c4b5423f27d33a82ffd101daa705f0c8f7f854;hb=f532c1d517d573a64accde31220e2ffbbb00354f;hp=cec9d67752374a821c5a1a42f6d0d418f9dfcc89;hpb=d739ecb22a85d8f982add6d429e069edf7e0dde2;p=mkjsf-moved-to-github.git

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 cec9d67..e9c4b54 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/RecordCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/RecordCommand.java
@@ -1,15 +1,59 @@
 package com.indexdata.mkjsf.pazpar2.commands;
 
+import org.apache.log4j.Logger;
+
+import com.indexdata.mkjsf.pazpar2.ClientCommandResponse;
+import com.indexdata.mkjsf.pazpar2.HttpResponseWrapper;
+import com.indexdata.mkjsf.pazpar2.Pz2Service;
 import com.indexdata.mkjsf.pazpar2.commands.sp.RecordCommandSp;
 import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommand;
-import com.indexdata.mkjsf.pazpar2.state.StateManager;
+import com.indexdata.mkjsf.pazpar2.data.RecordResponse;
+import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;
+import com.indexdata.mkjsf.pazpar2.data.ResponseParser;
 
 public class RecordCommand extends Pazpar2Command implements ServiceProxyCommand {
 
   private static final long serialVersionUID = 2817539422114569506L;
+  private static Logger logger = Logger.getLogger(RecordCommand.class);
 
-  public RecordCommand(StateManager stateMgr) {
-    super("record",stateMgr);
+  public RecordCommand() {
+    super("record");
+  }
+  
+  @Override
+  public ResponseDataObject run() {
+    ResponseDataObject responseObject = null;
+    if (hasParameterValue("id")) {
+      HttpResponseWrapper commandResponse = Pz2Service.get().getSearchClient().executeCommand(this);
+      
+      if (commandResponse.getContentType().contains("xml")) {
+        responseObject = ResponseParser.getParser().getDataObject((ClientCommandResponse)commandResponse);
+        if (ResponseParser.docTypes.contains(responseObject.getType())) {
+          logger.debug("Storing " + responseObject.getType() + " in pzresp. ");
+        } else {
+          logger.debug("Command was 'record' but response not '<record>' - assuming raw record response.");
+          ResponseDataObject recordResponse = new RecordResponse();
+          recordResponse.setType("record");
+          recordResponse.setXml(responseObject.getXml());
+          recordResponse.setAttribute("activeclients", "0");
+          responseObject = recordResponse;
+        }
+      } else if (commandResponse.isBinary()) {
+        responseObject = new RecordResponse();
+        responseObject.setType(getCommandName());
+        logger.info("Binary response");
+        responseObject.setAttribute("activeclients", "0");
+        responseObject.setXml("<record>binary response</record>");
+        responseObject.setBinary(commandResponse.getBytes());
+      } else {
+        logger.error("Response was not found to be XML or binary. The response was not handled.");
+      }
+      Pz2Service.get().getPzresp().put(getCommandName(), responseObject);
+    } else {
+      logger.debug("No record id parameter on this command. Ignoring request but clearing any previous record result.");
+      Pz2Service.get().getPzresp().put(getCommandName(), new RecordResponse());
+    }
+    return responseObject;
   }
   
   public void setId(String recId) {
@@ -70,7 +114,7 @@ public class RecordCommand extends Pazpar2Command implements ServiceProxyCommand
 
   @Override
   public RecordCommand copy () {
-    RecordCommand newCommand = new RecordCommand(stateMgr);
+    RecordCommand newCommand = new RecordCommand();
     for (String parameterName : parameters.keySet()) {
       newCommand.setParameterInState(parameters.get(parameterName).copy());      
     }