- public CommandResponse executeCommand(Pazpar2Command command, ByteArrayOutputStream baos) \r
- throws Pazpar2ErrorException, IOException {\r
- ClientCommand clientCommand = new ClientCommand(command.getName(), command.getEncodedQueryString());\r
- Pazpar2HttpResponse pz2HttpResponse = client.executeCommand(clientCommand, baos);\r
- return new Pz2CommandResponse(pz2HttpResponse,baos);\r
+ public HttpResponseWrapper executeCommand(Pazpar2Command command) {\r
+ ClientCommandResponse commandResponse = null;\r
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();\r
+ ClientCommand clientCommand = new ClientCommand(command.getCommandName(), command.getEncodedQueryString());\r
+ Pazpar2HttpResponse pz2HttpResponse = null;\r
+ long start = System.currentTimeMillis();\r
+ try {\r
+ pz2HttpResponse = client.executeCommand(clientCommand, baos);\r
+ if (pz2HttpResponse.getStatusCode()==200) {\r
+ commandResponse = new ClientCommandResponse(pz2HttpResponse,baos);\r
+ } else if (pz2HttpResponse.getStatusCode()==417) {\r
+ logger.error("Pazpar2 status code 417: " + baos.toString("UTF-8"));\r
+ commandResponse = new ClientCommandResponse(pz2HttpResponse.getStatusCode(),CommandError.insertErrorXml(command.getCommandName(), String.valueOf(pz2HttpResponse.getStatusCode()) ,"Pazpar2: Expectation failed (417)", baos.toString("UTF-8")),"text/xml"); \r
+ } else {\r
+ String resp = baos.toString("UTF-8");\r
+ logger.error("Pazpar2 status code was " + pz2HttpResponse.getStatusCode() + ": " + resp);\r
+ commandResponse = new ClientCommandResponse(pz2HttpResponse.getStatusCode(),CommandError.insertErrorXml(command.getCommandName(), String.valueOf(pz2HttpResponse.getStatusCode()), "Pazpar2 error occurred", baos.toString("UTF-8")),"text/xml");\r
+ throw new Pazpar2ErrorException(resp,pz2HttpResponse.getStatusCode(),resp,null);\r
+ } \r
+ } catch (IOException e) {\r
+ logger.error(e.getMessage());\r
+ e.printStackTrace();\r
+ commandResponse = new ClientCommandResponse(-1,CommandError.createErrorXml(command.getCommandName(), String.valueOf(pz2HttpResponse.getStatusCode()), "io", e.getMessage()),"text/xml"); \r
+ } catch (Pazpar2ErrorException e) {\r
+ logger.error(e.getMessage());\r
+ e.printStackTrace();\r
+ logger.error("Creating error XML");\r
+ commandResponse = new ClientCommandResponse(-1,CommandError.createErrorXml(command.getCommandName(), String.valueOf(pz2HttpResponse.getStatusCode()), "io", e.getMessage()),"text/xml");\r
+ }\r
+ long end = System.currentTimeMillis(); \r
+ logger.debug("Executed " + command.getCommandName() + " in " + (end-start) + " ms." );\r
+ return commandResponse;\r