import com.indexdata.mkjsf.errors.ErrorHelper;\r
import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;\r
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2ResponseData;\r
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2ResponseParser;\r
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2Responses;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
+import com.indexdata.mkjsf.pazpar2.data.Responses;\r
import com.indexdata.mkjsf.pazpar2.data.RecordResponse;\r
import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;\r
import com.indexdata.mkjsf.pazpar2.state.StateListener;\r
@Inject ConfigurationReader configurator;\r
@Inject StateManager stateMgr;\r
@Inject Pazpar2Commands pzreq;\r
- @Inject Pazpar2Responses pzresp;\r
+ @Inject Responses pzresp;\r
@Inject ErrorCentral errors;\r
@Inject ServiceProxyUser user;\r
\r
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
- CommandResponse response = thread.getCommandResponse();\r
+ ClientCommandResponse response = (ClientCommandResponse) thread.getCommandResponse();\r
responseLogger.debug("Response was: " + response.getResponseString());\r
- Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response.getResponseString());\r
- if (Pazpar2ResponseParser.docTypes.contains(responseObject.getType())) {\r
+ ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);\r
+ if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
pzresp.put(commandName, responseObject);\r
} else {\r
if (commandName.equals("record") && \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
- logger.error("Did not attemt to run command(s) due to a validation error.");\r
+ logger.debug("Did not attempt to run command(s) that were not ready.");\r
return "0";\r
}\r
} else { \r
public boolean commandsAreValid(String commands) {\r
if (commands.equals("record")) {\r
if (!pzreq.getCommand("record").hasParameterValue("id")) {\r
- logger.error("Attempt to send record command without the id parameter");\r
+ logger.debug("Attempt to send record command without the id parameter");\r
return false;\r
}\r
}\r
\r
public void setServiceProxyUrl(String url) {\r
searchClient = spClient;\r
+ setServiceType(SERVICE_TYPE_SP);\r
setServiceUrl(url);\r
}\r
\r
public String getServiceProxyUrl () {\r
- return spClient.getServiceUrl();\r
+ if (isServiceProxyService()) {\r
+ return spClient.getServiceUrl();\r
+ } else {\r
+ return "";\r
+ }\r
}\r
\r
public void setPazpar2Url(String url) {\r
searchClient = pz2Client;\r
+ setServiceType(SERVICE_TYPE_PZ2);\r
setServiceUrl(url);\r
}\r
\r
public String getPazpar2Url() {\r
- return pz2Client.getServiceUrl();\r
+ if (isPazpar2Service()) {\r
+ return pz2Client.getServiceUrl();\r
+ } else {\r
+ return "";\r
+ }\r
}\r
\r
\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