Sanitary

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
index 128525b..c6af028 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
@@ -29,8 +29,7 @@ public class Pz2Config implements ModuleConfigurationGetter, Serializable {
     setDefaults();\r
   }\r
   \r
-  public Pz2Config (Map<String,String> parameters) {\r
-    //logger.debug(Utils.objectId(this) + " being constructed with parameter map argument");\r
+  public Pz2Config (Map<String,String> parameters) {    \r
     setDefaults();\r
     for (String key : parameters.keySet()) {\r
       properties.put(key, parameters.get(key));\r
@@ -65,14 +64,6 @@ public class Pz2Config implements ModuleConfigurationGetter, Serializable {
     properties.put(key, value);\r
   }\r
   \r
-  public void setPazpar2Url (String value) {\r
-    properties.put("PAZPAR2_URL", value);\r
-  }\r
-  \r
-  public void setPazpar2ServiceId (String value) {\r
-    properties.put("PAZPAR2_SERVICE_ID",value);\r
-  }\r
-\r
   @Override\r
   public String get(String key, String defaultValue) {\r
     if (properties.containsKey(key)) {\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
index 95f69fe..e6418fc 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
@@ -60,10 +60,9 @@ public class Pz2ConfigureByMk2Config implements Pz2Configurator  {
     }        \r
   }\r
   \r
-\r
   public List<String> document() {\r
     List<String> doc = new ArrayList<String>();\r
-    doc.add(":"+nl+"Attempted to configure service using the file " + configFilePathAndName);\r
+    doc.add(nl+"Attempted to configure service using the file " + configFilePathAndName);\r
     doc.add(nl+"-- Configured to access Pazpar2 at: " +pz2config.get("PAZPAR2_URL"));\r
     if (pz2config.get("PAZPAR2_SERVICE_XML") != null) {\r
       doc.add(nl+"-- Configured to use the service definition contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SERVICE_XML"));\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
index 267f1b4..17f8545 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
@@ -1,5 +1,6 @@
 package com.indexdata.pz2utils4jsf.pazpar2;\r
 \r
+import java.io.ByteArrayOutputStream;\r
 import java.io.IOException;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
@@ -12,18 +13,20 @@ import javax.inject.Named;
 \r
 import org.apache.log4j.Logger;\r
 \r
+import com.indexdata.masterkey.pazpar2.client.ClientCommand;\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.Pazpar2ErrorException;\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.ConfigurationError;\r
 import com.indexdata.pz2utils4jsf.errors.ConfigurationException;\r
-import com.indexdata.pz2utils4jsf.errors.ErrorInterface;\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
@@ -71,12 +74,14 @@ public class Pz2Session implements Pz2Interface {
       }\r
       if (cfg != null) {\r
         try {\r
-          client = new Pazpar2ClientGeneric(cfg);     \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("Found " + configurationErrors.size() + " configuration errors");        \r
+        if (hasConfigurationErrors()) {\r
+          logger.info("Found " + configurationErrors.size() + " configuration errors");\r
+        }\r
       }\r
       resetDataObjects();\r
     } else {\r