import com.indexdata.mkjsf.errors.ConfigurationException;\r
import com.indexdata.mkjsf.errors.ErrorCentral;\r
import com.indexdata.mkjsf.errors.ErrorHelper;\r
-import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;\r
import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;\r
import com.indexdata.mkjsf.pazpar2.data.RecordResponse;\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.state.StateListener;\r
import com.indexdata.mkjsf.pazpar2.state.StateManager;\r
\r
\r
private static final long serialVersionUID = 3440277287081557861L;\r
- private static Logger logger = Logger.getLogger(Pz2Bean.class);\r
- private static Logger responseLogger = Logger.getLogger("com.indexdata.mkjsf.pazpar2.responses"); \r
+ private static Logger logger = Logger.getLogger(Pz2Bean.class); \r
protected Pz2Client pz2Client = null;\r
protected ServiceProxyClient spClient = null;\r
protected SearchClient searchClient = null; \r
public @interface Preferred{}\r
\r
@Produces @Preferred @SessionScoped @Named("pzresp") public Responses getPzresp () {\r
- logger.info("Producing pzresp");\r
+ logger.trace("Producing pzresp");\r
return pzresp;\r
}\r
\r
@Produces @Preferred @SessionScoped @Named("pzreq") public Pazpar2Commands getPzreq () {\r
- logger.info("Producing pzreq");\r
+ logger.trace("Producing pzreq");\r
return pzreq;\r
}\r
\r
@Produces @Preferred @SessionScoped @Named("errors") public ErrorCentral getErrors() {\r
- logger.info("Producing errors");\r
+ logger.trace("Producing errors");\r
return errors;\r
}\r
\r
@Produces @Preferred @SessionScoped @Named("stateMgr") public StateManager getStateMgr() {\r
- logger.info("Produces stateMgr");\r
+ logger.trace("Producing stateMgr");\r
return stateMgr;\r
}\r
-\r
\r
public void configureClient(SearchClient client, ConfigurationReader configReader) {\r
logger.debug(Utils.objectId(this) + " will configure search client for the session");\r
pzreq.getRecord().removeParametersInState();\r
pzreq.getSearch().removeParametersInState(); \r
}\r
- \r
- public void doSearch(String query) {\r
- pzreq.getSearch().setParameter(new CommandParameter("query","=",query)); \r
- doSearch();\r
- }\r
-\r
- public void doSearch() {\r
- try {\r
- if (errors.hasConfigurationErrors()) {\r
- logger.error("Ignoring search request due to configuration errors.");\r
- } else if (searchClient == null){\r
- logger.error("No search client defined. A client must either be pre-configured or selected before searching.");\r
- errors.addConfigurationError(new ConfigurationError("No client defined","Client is null","No search client defined. A client must be pre-configured or selected runtime, prior to searching."));\r
- } else {\r
- stateMgr.hasPendingStateChange("search",false);\r
- pzresp.resetSearchAndBeyond();\r
- pzreq.getRecord().removeParametersInState(); \r
- pzreq.getShow().setParameterInState(new CommandParameter("start","=",0)); \r
- logger.debug(Utils.objectId(this) + " is searching using "+pzreq.getCommand("search").getUrlEncodedParameterValue("query"));\r
- searchClient.setSearchCommand(pzreq.getCommand("search"));\r
- doCommand("search");\r
- }\r
- } catch (NullPointerException npe) {\r
- npe.printStackTrace(); \r
- }\r
- }\r
- \r
- public String doRecord() {\r
- if (errors.hasConfigurationErrors()) {\r
- logger.error("Ignoring record request due to configuration errors.");\r
- return "";\r
- } else if (!pzreq.getCommand("record").hasParameterValue("id")) {\r
- logger.debug("Ignoring record request due to no id parameter.");\r
- return "";\r
- } else if (pzresp.getSearch().hasApplicationError()) {\r
- logger.debug("Ignoring record request due search error.");\r
- return "";\r
- } else {\r
- logger.debug("Executing record command");\r
- doCommand("record");\r
- return pzresp.getRecord().getActiveClients();\r
- }\r
- }\r
\r
/**\r
* Refreshes 'show', 'stat', 'termlist', and 'bytarget' data object from pazpar2\r
logger.debug("Request to update: " + commands);\r
try {\r
if (commands.equals("search")) {\r
- doSearch();\r
+ pzreq.getSearch().run();\r
return "new";\r
} else if (commands.equals("record")) {\r
- return doRecord();\r
+ pzreq.getRecord().run();\r
+ return pzresp.getRecord().getActiveClients();\r
} else if (pzresp.getSearch().isNew()) {\r
// For returning notification of 'search started' quickly to UI\r
logger.info("New search. Marking it old, then returning 'new' to trigger another round-trip.");\r
List<CommandThread> threadList = new ArrayList<CommandThread>();\r
StringTokenizer tokens = new StringTokenizer(commands,",");\r
while (tokens.hasMoreElements()) { \r
- threadList.add(new CommandThread(pzreq.getCommand(tokens.nextToken()),searchClient)); \r
+ threadList.add(new CommandThread(pzreq.getCommand(tokens.nextToken()),searchClient,Pz2Bean.get().getPzresp())); \r
}\r
for (CommandThread thread : threadList) {\r
thread.start();\r
e.printStackTrace();\r
}\r
}\r
- for (CommandThread thread : threadList) {\r
- String commandName = thread.getCommand().getCommandName();\r
- ClientCommandResponse response = (ClientCommandResponse) thread.getCommandResponse();\r
- responseLogger.debug("Response was: " + response.getResponseString());\r
- ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);\r
- if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
- pzresp.put(commandName, responseObject);\r
- } else {\r
- logger.info("Unknown doc type [" + responseObject.getType() + "]. Was not cached.");\r
- }\r
- }\r
return pzresp.getActiveClients();\r
}\r
} \r
protected void handleQueryStateChanges (String commands) {\r
if (stateMgr.hasPendingStateChange("search") && hasQuery()) { \r
logger.info("Triggered search: Found pending search change [" + pzreq.getCommand("search").toString() + "], doing search before updating " + commands); \r
- doSearch();\r
+ pzreq.getSearch().run();\r
} \r
if (stateMgr.hasPendingStateChange("record") && ! commands.equals("record")) { \r
logger.debug("Found pending record ID change. Doing record before updating " + commands);\r
stateMgr.hasPendingStateChange("record",false);\r
- if (pzreq.getCommand("record").hasParameterValue("id")) {\r
- doRecord();\r
- } else { \r
- pzresp.put("record", new RecordResponse());\r
- }\r
+ pzreq.getRecord().run();\r
}\r
}\r
\r
pzreq.getSearch().removeParametersInState();\r
pzresp.getSp().resetAuthAndBeyond(true); \r
searchClient.setServiceUrl(url);\r
- // pzreq.setService(this);\r
} \r
}\r
\r
projects / mkjsf-moved-to-github.git / blobdiff