package com.indexdata.pz2utils4jsf.pazpar2;\r
\r
-import java.io.IOException;\r
import java.util.ArrayList;\r
import java.util.List;\r
import java.util.Map;\r
\r
import org.apache.log4j.Logger;\r
\r
-import com.indexdata.masterkey.pazpar2.client.Pazpar2Client;\r
-import com.indexdata.masterkey.pazpar2.client.Pazpar2ClientConfiguration;\r
-import com.indexdata.masterkey.pazpar2.client.Pazpar2ClientGeneric;\r
-import com.indexdata.masterkey.pazpar2.client.exceptions.ProxyErrorException;\r
import com.indexdata.pz2utils4jsf.config.Pz2Configurator;\r
import com.indexdata.pz2utils4jsf.controls.ResultsPager;\r
-import com.indexdata.pz2utils4jsf.errors.ApplicationError;\r
+import com.indexdata.pz2utils4jsf.errors.ConfigurationException;\r
import com.indexdata.pz2utils4jsf.errors.ErrorHelper;\r
-import com.indexdata.pz2utils4jsf.errors.ConfigurationError;\r
-import com.indexdata.pz2utils4jsf.pazpar2.data.CommandError;\r
+import com.indexdata.pz2utils4jsf.errors.ErrorInterface;\r
import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;\r
+import com.indexdata.pz2utils4jsf.pazpar2.data.CommandError;\r
import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseData;\r
import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseParser;\r
import com.indexdata.pz2utils4jsf.pazpar2.data.RecordResponse;\r
\r
@Named @SessionScoped \r
public class Pz2Session implements Pz2Interface {\r
- \r
+ \r
+ private static final long serialVersionUID = 3947514708343320514L;\r
private static Logger logger = Logger.getLogger(Pz2Session.class);\r
\r
private Map<String,Pazpar2ResponseData> dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();\r
private QueryStates queryStates = new QueryStates();\r
+ private ErrorHelper errorHelper = null;\r
\r
- private static final long serialVersionUID = 3947514708343320514L; \r
- private Pazpar2ClientConfiguration cfg = null;\r
- private Pazpar2Client client = null; \r
+ private List<ErrorInterface> configurationErrors = null;\r
+ private SearchClient searchClient = null; \r
private TargetFilter targetFilter = null; \r
private ResultsPager pager = null; \r
- private ErrorHelper errorHelper = null;\r
- private List<ApplicationError> configurationErrors = null;\r
- \r
+ \r
public Pz2Session () {\r
logger.info("Instantiating pz2 session object [" + Utils.objectId(this) + "]"); \r
}\r
\r
- public void init(Pz2Configurator pz2conf) {\r
- if (client==null) {\r
- configurationErrors = new ArrayList<ApplicationError>();\r
- errorHelper = new ErrorHelper(pz2conf);\r
- logger.info(Utils.objectId(this) + " is configuring itself using the provided " + Utils.objectId(pz2conf));\r
- try {\r
- cfg = new Pazpar2ClientConfiguration(pz2conf.getConfig());\r
- } catch (ProxyErrorException pe) {\r
- logger.error("Could not configure Pazpar2 client: " + pe.getMessage());\r
- configurationErrors.add(new ConfigurationError("Pz2Client Config","ProxyError","Could not configure Pazpar2 client: " + pe.getMessage(),errorHelper));\r
- } catch (IOException io) {\r
- logger.error("Could not configure Pazpar2 client: " + io.getMessage());\r
- configurationErrors.add(new ConfigurationError("Pz2Client Config","ProxyError","Could not configure Pazpar2 client: " + io.getMessage(),errorHelper));\r
- }\r
- if (cfg != null) {\r
- try {\r
- client = new Pazpar2ClientGeneric(cfg); \r
- } catch (ProxyErrorException pe) {\r
- logger.error("Could not instantiate Pazpar2 client: " + pe.getMessage());\r
- configurationErrors.add(new ConfigurationError("Pz2Client error","ProxyError","Could not create Pazpar2 client: " +pe.getMessage(),errorHelper)); \r
- } \r
- logger.info("Got " + configurationErrors.size() + " configuration errors"); \r
- }\r
- resetDataObjects();\r
- } else {\r
- logger.warn("Attempt to configure session but it already has a configured client");\r
- }\r
+ public void init(SearchClient searchClient, Pz2Configurator configurator) {\r
+ configurationErrors = new ArrayList<ErrorInterface>();\r
+ errorHelper = new ErrorHelper(configurator); \r
+ logger.debug(Utils.objectId(this) + " will configure search client for the session");\r
+ try {\r
+ searchClient.configure(configurator);\r
+ \r
+ // The cloning is a hack: \r
+ // At the time of writing this search client is injected using Weld. \r
+ // However, the client is used for asynchronously sending off requests\r
+ // to the server AND propagation of context to threads is not supported.\r
+ // Trying so will throw a WELD-001303 error. To avoid that, a context\r
+ // free client is spawned from the context dependent one. \r
+ this.searchClient = searchClient.cloneMe();\r
+ \r
+ } catch (ConfigurationException e) {\r
+ logger.info("Found " + configurationErrors.size() + " configuration errors"); \r
+ } \r
+ resetDataObjects();\r
}\r
\r
public void doSearch(String query) {\r
List<CommandThread> threadList = new ArrayList<CommandThread>();\r
StringTokenizer tokens = new StringTokenizer(commands,",");\r
while (tokens.hasMoreElements()) {\r
- threadList.add(new CommandThread(getCommand(tokens.nextToken()),client)); \r
+ threadList.add(new CommandThread(getCommand(tokens.nextToken()),searchClient)); \r
}\r
for (CommandThread thread : threadList) {\r
thread.start();\r
}\r
for (CommandThread thread : threadList) {\r
String commandName = thread.getCommand().getName();\r
- Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(thread.getResponse());\r
+ String response = thread.getResponse();\r
+ logger.debug("Response was: " + response);\r
+ Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response);\r
dataObjects.put(commandName, responseObject); \r
}\r
return getActiveClients();\r
return "0";\r
}\r
} else {\r
- configurationErrors.add(\r
- new ConfigurationError("Querying while errors",\r
- "App halted",\r
- "Cannot query Pazpar2 while there are configuration errors.",\r
- errorHelper));\r
+ logger.error("Did not attempt to execute query since there are configuration errors.");\r
return "0";\r
}\r
\r
return hasConfigurationErrors() || hasCommandErrors();\r
}\r
\r
- public List<ApplicationError> getConfigurationErrors() { \r
+ public List<ErrorInterface> getConfigurationErrors() { \r
return configurationErrors;\r
}\r
\r
* error found for an arbitrary command, if any, otherwise\r
* an empty dummy error. \r
*/ \r
- public ApplicationError getCommandError() {\r
+ public ErrorInterface getCommandError() {\r
CommandError error = new CommandError(); \r
if (dataObjects.get("search").hasApplicationError()) {\r
error = dataObjects.get("search").getApplicationError(); \r