errors.addConfigurationError(new ConfigurationError("Search Client","Configuration",e.getMessage())); \r
} \r
logger.info(configReader.document());\r
- pzresp.reset(); \r
+ pzresp.resetAllSessionData(); \r
}\r
\r
- public void resetSearchAndResults () {\r
+ public void resetSearchAndRecordCommands () {\r
pzreq.getRecord().removeParametersInState();\r
- pzreq.getSearch().removeParametersInState();\r
- pzresp.reset(); \r
+ pzreq.getSearch().removeParametersInState(); \r
}\r
\r
\r
\r
public void doSearch() { \r
stateMgr.hasPendingStateChange("search",false);\r
- pzresp.reset();\r
+ pzresp.resetSearchResponses();\r
// resets some record and show command parameters without \r
// changing state or creating state change feedback\r
pzreq.getRecord().removeParametersInState(); \r
}\r
for (CommandThread thread : threadList) {\r
String commandName = thread.getCommand().getCommandName();\r
- HttpResponseWrapper response = thread.getCommandResponse();\r
+ ClientCommandResponse response = (ClientCommandResponse) thread.getCommandResponse();\r
responseLogger.debug("Response was: " + response.getResponseString());\r
- ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response.getResponseString());\r
+ ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);\r
if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
pzresp.put(commandName, responseObject);\r
} else {\r
} \r
} else {\r
logger.debug("Skipped requests for " + commands + " as there's not yet a query."); \r
- pzresp.reset();\r
+ pzresp.resetSearchResponses();\r
return "0";\r
}\r
} else {\r
if (url!=null && searchClient != null && !url.equals(searchClient.getServiceUrl())) {\r
pzreq.getRecord().removeParametersInState();\r
pzreq.getSearch().removeParametersInState();\r
- pzresp.reset();\r
+ pzresp.resetAllSessionData();\r
user.clear();\r
searchClient.setServiceUrl(url);\r
} \r
private void setServiceType(String type) {\r
if (!serviceType.equals(type) &&\r
!serviceType.equals(SERVICE_TYPE_TBD)) {\r
- resetSearchAndResults();\r
+ resetSearchAndRecordCommands();\r
+ pzresp.resetAllSessionData();\r
}\r
serviceType = type;\r
if (serviceType.equals(SERVICE_TYPE_PZ2)) {\r