\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
\r
private static final long serialVersionUID = 2817539422114569506L;\r
private static Logger logger = Logger.getLogger(RecordCommand.class);\r
+ private RecordCommandSp spCommand = null;\r
\r
public RecordCommand() {\r
super("record");\r
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
for (String parameterName : parameters.keySet()) {\r
newCommand.setParameterInState(parameters.get(parameterName).copy()); \r
} \r
+ newCommand.spCommand = this.spCommand;\r
return newCommand;\r
}\r
\r
* \r
*/\r
public RecordCommandSp getSp () {\r
- return new RecordCommandSp(this);\r
+ if (spCommand==null) {\r
+ spCommand = new RecordCommandSp(this);\r
+ } \r
+ return spCommand;\r
}\r
\r
@Override\r