X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FPz2Bean.java;h=4c31b96f9c3b370aefaea880d8e2f9ea7cca11be;hb=bb6de28597ea8fda75316a862c102e215cf9cc94;hp=9c43ddd3ad7d5050c74de0eb341d99b7f3b20795;hpb=b33554a0bda4b59cdc0b4a5e69623d6150228d39;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
index 9c43ddd..4c31b96 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -113,6 +113,9 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   public void doSearch() {
     if (errors.hasConfigurationErrors()) {
       logger.error("Ignoring search request due to configuration errors.");
+    } else if (searchClient == null){
+      logger.error("No search client defined. A client must either be pre-configured or selected before searching.");
+      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."));
     } else {
       stateMgr.hasPendingStateChange("search",false);
       pzresp.resetSearchResponses();
@@ -192,7 +195,10 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
       } else {
         handleQueryStateChanges(commands);
         if (pzresp.getSearch().hasApplicationError()) {
-          logger.error("The command(s) " + commands + " are cancelled because the latest search command had an error.");
+          logger.error("The command(s) " + commands + " cancelled because the latest search command had an error.");
+          return "0";
+        } else if (errors.hasConfigurationErrors()) {
+          logger.error("The command(s) " + commands + " cancelled due to configuration errors.");
           return "0";
         } else {
           logger.debug("Processing request for " + commands); 
@@ -452,6 +458,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
       serviceProxyUrls = config.getMultiProperty(SERVICE_PROXY_URL_LIST,",");
       pazpar2Urls = config.getMultiProperty(PAZPAR2_URL_LIST, ",");
     }
+    logger.info(reader.document());
     logger.info("Service Type is configured to " + serviceType);
     
   }