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=50e33d1c4709547e7992e7fd8013dd51653523fa;hpb=5745961a862c1f07e9abcb084f43c205f01631be;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 50e33d1..e9c4b54 100644 --- 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; import com.indexdata.mkjsf.pazpar2.ClientCommandResponse; import com.indexdata.mkjsf.pazpar2.HttpResponseWrapper; -import com.indexdata.mkjsf.pazpar2.Pz2Bean; +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.data.RecordResponse; @@ -24,34 +24,34 @@ public class RecordCommand extends Pazpar2Command implements ServiceProxyCommand public ResponseDataObject run() { ResponseDataObject responseObject = null; if (hasParameterValue("id")) { - HttpResponseWrapper commandResponse = Pz2Bean.get().getSearchClient().executeCommand(this); + 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 { + } else { logger.debug("Command was 'record' but response not '' - assuming raw record response."); - ResponseDataObject recordResponse = new RecordResponse(); + ResponseDataObject recordResponse = new RecordResponse(); recordResponse.setType("record"); - recordResponse.setXml(responseObject.getXml()); - recordResponse.setAttribute("activeclients", "0"); + recordResponse.setXml(responseObject.getXml()); + recordResponse.setAttribute("activeclients", "0"); + responseObject = recordResponse; } } else if (commandResponse.isBinary()) { - responseObject = new RecordResponse(); + responseObject = new RecordResponse(); responseObject.setType(getCommandName()); logger.info("Binary response"); responseObject.setAttribute("activeclients", "0"); responseObject.setXml("binary response"); responseObject.setBinary(commandResponse.getBytes()); - } else { logger.error("Response was not found to be XML or binary. The response was not handled."); } - Pz2Bean.get().getPzresp().put(getCommandName(), responseObject); + Pz2Service.get().getPzresp().put(getCommandName(), responseObject); } else { logger.debug("No record id parameter on this command. Ignoring request but clearing any previous record result."); - Pz2Bean.get().getPzresp().put(getCommandName(), new RecordResponse()); + Pz2Service.get().getPzresp().put(getCommandName(), new RecordResponse()); } return responseObject; }