package com.indexdata.pz2utils4jsf.pazpar2;\r
\r
import java.io.Serializable;\r
+import java.util.ArrayList;\r
import java.util.List;\r
+import java.util.StringTokenizer;\r
\r
import javax.annotation.PostConstruct;\r
import javax.enterprise.context.SessionScoped;\r
\r
import com.indexdata.pz2utils4jsf.config.ConfigurationReader;\r
import com.indexdata.pz2utils4jsf.controls.ResultsPager;\r
-import com.indexdata.pz2utils4jsf.errors.ErrorInterface;\r
-import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;\r
+import com.indexdata.pz2utils4jsf.errors.ConfigurationError;\r
+import com.indexdata.pz2utils4jsf.errors.ConfigurationException;\r
+import com.indexdata.pz2utils4jsf.errors.ErrorHelper;\r
+import com.indexdata.pz2utils4jsf.errors.ErrorCentral;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Commands;\r
+import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseData;\r
+import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseParser;\r
+import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2Responses;\r
import com.indexdata.pz2utils4jsf.pazpar2.data.RecordResponse;\r
-import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;\r
-import com.indexdata.pz2utils4jsf.pazpar2.data.StatResponse;\r
-import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;\r
-import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;\r
+import com.indexdata.pz2utils4jsf.pazpar2.state.StateListener;\r
+import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;\r
import com.indexdata.pz2utils4jsf.utils.Utils;\r
\r
@Named("pz2") @SessionScoped @Alternative\r
-public class Pz2Bean implements Pz2Interface, Serializable {\r
+public class Pz2Bean implements Pz2Interface, StateListener, Serializable {\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.pz2utils4jsf.pazpar2.responses");\r
+ \r
+ protected SearchClient searchClient = null;\r
\r
@Inject ConfigurationReader configurator;\r
- protected Pz2Session pz2; \r
- protected SearchClient searchClient; \r
- \r
+ @Inject StateManager stateMgr;\r
+ @Inject Pazpar2Commands pzreq;\r
+ @Inject Pazpar2Responses pzresp;\r
+ @Inject ErrorCentral errors;\r
+ \r
+ protected ResultsPager pager = null; \r
+\r
+ \r
+ protected ErrorHelper errorHelper = null;\r
+ \r
public Pz2Bean () {\r
- logger.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]");\r
+ logger.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]"); \r
}\r
\r
@PostConstruct\r
- public void initiatePz2Session() {\r
- logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session next.");\r
- pz2 = new Pz2Session();\r
- searchClient = new StraightPz2Client();\r
+ public void postConstruct() { \r
+ logger.debug("in start of Pz2Bean post-construct configurator is " + configurator);\r
+ logger.debug(Utils.objectId(this) + " will instantiate a Pz2Client next.");\r
+ searchClient = new Pz2Client();\r
logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" \r
- + Utils.objectId(configurator) + "] on session [" \r
- + Utils.objectId(pz2) + "]" ); \r
- pz2.init(searchClient,configurator);\r
- }\r
- \r
- \r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch(java.lang.String)\r
- */\r
- public void doSearch(String query) { \r
- pz2.doSearch(query);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch()\r
- */\r
- public void doSearch() {\r
- logger.info(Utils.objectId(this) + " doing search for "+this.getQuery());\r
- pz2.doSearch();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#update()\r
- */\r
- public String update() {\r
- return pz2.update();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#update(java.lang.String)\r
- */\r
- public String update(String commands) {\r
- return pz2.update(commands);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setQuery(java.lang.String)\r
- */\r
- public void setQuery(String query) {\r
- pz2.setQuery(query);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getQuery()\r
- */\r
- public String getQuery() {\r
- return pz2.getQuery();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setFacet(java.lang.String, java.lang.String)\r
- */\r
- public void setFacet(String facetKey, String term) {\r
- pz2.setFacet(facetKey, term);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeFacet(java.lang.String, java.lang.String)\r
- */\r
- public void removeFacet(String facetKey, String term) {\r
- pz2.removeFacet(facetKey, term);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setFacetOnQuery(java.lang.String, java.lang.String)\r
- */\r
- public void setFacetOnQuery(String facetKey, String term) {\r
- pz2.setFacetOnQuery(facetKey, term);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setTargetFilter(java.lang.String, java.lang.String)\r
- */\r
- public void setTargetFilter(String targetId, String targetName) {\r
- pz2.setTargetFilter(targetId, targetName);\r
- }\r
- \r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeTargetFilter()\r
- */\r
- public void removeTargetFilter () {\r
- pz2.removeTargetFilter();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTargetFilter()\r
- */\r
- public TargetFilter getTargetFilter() {\r
- return pz2.getTargetFilter();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasTargetFilter()\r
- */\r
- public boolean hasTargetFilter() {\r
- return pz2.hasTargetFilter();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setSort(java.lang.String)\r
- */\r
- public void setSort(String sortOption) {\r
- pz2.setSort(sortOption);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getSort()\r
- */\r
- public String getSort() {\r
- return pz2.getSort();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setPageSize(int)\r
- */\r
- public void setPageSize(int perPageOption) {\r
- pz2.setPageSize(perPageOption);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getPageSize()\r
- */\r
- public int getPageSize() {\r
- return pz2.getPageSize();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setStart(int)\r
- */\r
- public void setStart(int start) {\r
- pz2.setStart(start);\r
- }\r
+ + Utils.objectId(configurator) + "]" ); \r
+ configureClient(searchClient,configurator); \r
+ stateMgr.addStateListener(this); \r
+ } \r
\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getStart()\r
- */\r
- public int getStart() {\r
- return pz2.getStart();\r
+ public void configureClient(SearchClient searchClient, ConfigurationReader configReader) {\r
+ logger.debug(Utils.objectId(this) + " will configure search client for the session");\r
+ try {\r
+ searchClient.configure(configReader); \r
+ } catch (ConfigurationException e) {\r
+ logger.debug("Pz2Bean adding configuration error");\r
+ errors.addConfigurationError(new ConfigurationError("Search Client","Configuration",e.getMessage())); \r
+ } \r
+ logger.info(configReader.document());\r
+ pzresp.reset(); \r
}\r
\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#toggleRecord(java.lang.String)\r
- */\r
- public String toggleRecord(String recid) {\r
- return pz2.toggleRecord(recid);\r
- }\r
- \r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getShow()\r
- */\r
- public ShowResponse getShow() {\r
- return pz2.getShow();\r
- }\r
- \r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getStat()\r
- */\r
- public StatResponse getStat() {\r
- return pz2.getStat();\r
- }\r
\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasRecord(java.lang.String)\r
- */\r
- public boolean hasRecord(String recId) { \r
- return pz2.hasRecord(recId);\r
+ public void doSearch(String query) {\r
+ pzreq.getSearch().setParameter(new CommandParameter("query","=",query)); \r
+ doSearch();\r
+ }\r
+\r
+ public void doSearch() { \r
+ stateMgr.hasPendingStateChange("search",false);\r
+ pzresp.reset();\r
+ // resets some record and show command parameters without \r
+ // changing state or creating state change feedback\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
+ doCommand("search"); \r
+ }\r
+ \r
+ /**\r
+ * Refreshes 'show', 'stat', 'termlist', and 'bytarget' data object from pazpar2\r
+ * \r
+ * @return Number of activeclients at the time of the 'show' command.\r
+ */\r
+ public String update () {\r
+ logger.debug("Updating show,stat,termlist,bytarget from pazpar2");\r
+ return update("show,stat,termlist,bytarget");\r
+ }\r
+ \r
+ /**\r
+ * Refreshes the data objects listed in 'commands' from pazpar2\r
+ * \r
+ * @param commands\r
+ * @return Number of activeclients at the time of the 'show' command\r
+ */\r
+ public String update (String commands) {\r
+ if (! errors.hasConfigurationErrors()) {\r
+ if (commandsAreValid(commands)) {\r
+ if (hasQuery()) {\r
+ handleQueryStateChanges(commands);\r
+ logger.debug("Processing request for " + commands); \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
+ }\r
+ for (CommandThread thread : threadList) {\r
+ thread.start();\r
+ }\r
+ for (CommandThread thread : threadList) {\r
+ try {\r
+ thread.join();\r
+ } catch (InterruptedException e) {\r
+ e.printStackTrace();\r
+ }\r
+ }\r
+ for (CommandThread thread : threadList) {\r
+ String commandName = thread.getCommand().getName();\r
+ String response = thread.getResponse();\r
+ responseLogger.debug("Response was: " + response);\r
+ Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response);\r
+ pzresp.put(commandName, responseObject); \r
+ }\r
+ if (commands.equals("record")) {\r
+ logger.debug("Record: Active clients: "+pzresp.getRecord().getActiveClients());\r
+ return pzresp.getRecord().getActiveClients();\r
+ } else {\r
+ return pzresp.getActiveClients();\r
+ } \r
+ } else {\r
+ logger.debug("Skipped requests for " + commands + " as there's not yet a query."); \r
+ pzresp.reset();\r
+ return "0";\r
+ }\r
+ } else {\r
+ logger.error("Did not attemt to run command(s) due to a validation error.");\r
+ return "0";\r
+ }\r
+ } else { \r
+ logger.error("Did not attempt to execute query since there are configuration errors.");\r
+ return "0";\r
+ }\r
+ \r
}\r
\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getRecord()\r
- */\r
- public RecordResponse getRecord() {\r
- return pz2.getRecord();\r
+ public boolean commandsAreValid(String commands) {\r
+ if (commands.equals("record")) {\r
+ if (!pzreq.getCommand("record").hasParameterSet("id")) {\r
+ logger.error("Attempt to send record command without the id parameter");\r
+ return false;\r
+ }\r
+ }\r
+ return true;\r
}\r
- \r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTermLists()\r
- */\r
- public TermListsResponse getTermLists() {\r
- return pz2.getTermLists();\r
+ \r
+ public String toggleRecord (String recId) {\r
+ if (hasRecord(recId)) {\r
+ pzreq.getRecord().removeParameters(); \r
+ pzresp.put("record", new RecordResponse());\r
+ return "";\r
+ } else {\r
+ pzreq.getRecord().setId(recId);\r
+ return doCommand("record");\r
+ }\r
}\r
\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getFacetTerms(java.lang.String, int)\r
- */\r
- public List<TermResponse> getFacetTerms(String facet, int count) {\r
- return pz2.getFacetTerms(facet, count);\r
+ @Override\r
+ public boolean hasRecord (String recId) {\r
+ return pzreq.getCommand("record").hasParameters() && pzresp.getRecord().getRecId().equals(recId);\r
}\r
- \r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getFacetTerms(java.lang.String)\r
- */\r
- public List<TermResponse> getFacetTerms(String facet) { \r
- return pz2.getFacetTerms(facet);\r
- } \r
- \r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getByTarget()\r
- */\r
- public ByTarget getByTarget() { \r
- return pz2.getByTarget();\r
+ \r
+ public String getCurrentStateKey () { \r
+ return stateMgr.getCurrentState().getKey();\r
}\r
- \r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasRecords()\r
- */\r
- public boolean hasRecords() {\r
- return pz2.hasRecords();\r
+ \r
+ public void setCurrentStateKey(String key) { \r
+ stateMgr.setCurrentStateKey(key);\r
}\r
\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setPager(int)\r
- */\r
- public ResultsPager setPager(int pageRange) {\r
- return pz2.setPager(pageRange);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getPager()\r
- */\r
- public ResultsPager getPager() {\r
- return pz2.getPager();\r
- }\r
\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getCurrentStateKey()\r
- */\r
- public String getCurrentStateKey() {\r
- return pz2.getCurrentStateKey();\r
+ \r
+ protected boolean hasQuery() { \r
+ return pzreq.getCommand("search").hasParameterSet("query"); \r
}\r
\r
- /* (non-Javadoc)\r
- * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setCurrentStateKey(java.lang.String)\r
- */\r
- public void setCurrentStateKey(String key) {\r
- pz2.setCurrentStateKey(key); \r
+ \r
+ public ResultsPager getPager () {\r
+ if (pager == null) {\r
+ pager = new ResultsPager(pzresp); \r
+ } \r
+ return pager; \r
}\r
\r
- public boolean hasErrors() {\r
- return pz2.hasErrors();\r
+ public ResultsPager setPager (int pageRange) {\r
+ pager = new ResultsPager(pzresp,pageRange,pzreq);\r
+ return pager;\r
}\r
\r
- public ErrorInterface getCommandError() {\r
- return pz2.getCommandError();\r
+ protected void handleQueryStateChanges (String commands) {\r
+ if (stateMgr.hasPendingStateChange("search") && hasQuery()) { \r
+ logger.debug("Found pending search change. Doing search before updating " + commands); \r
+ doSearch();\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").hasParameterSet("id")) {\r
+ update("record");\r
+ } else { \r
+ pzresp.put("record", new RecordResponse());\r
+ }\r
+ }\r
+ }\r
+ \r
+ protected String doCommand(String commandName) { \r
+ logger.debug(pzreq.getCommand(commandName).getEncodedQueryString() + ": Results for "+ pzreq.getCommand("search").getEncodedQueryString());\r
+ return update(commandName);\r
}\r
\r
- public List<ErrorInterface> getConfigurationErrors () {\r
- return pz2.getConfigurationErrors();\r
- }\r
-\r
@Override\r
- public boolean hasCommandErrors() {\r
- return pz2.hasCommandErrors();\r
+ public void stateUpdated(String commandName) {\r
+ logger.debug("State change reported for [" + commandName + "]");\r
+ if (commandName.equals("show")) {\r
+ logger.debug("Updating show");\r
+ update(commandName);\r
+ } \r
}\r
\r
- @Override\r
- public boolean hasConfigurationErrors() {\r
- return pz2.hasConfigurationErrors();\r
- }\r
\r
}\r
projects / mkjsf-moved-to-github.git / blobdiff