Refactors commands and injection

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / pazpar2 / data / Responses.java

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java b/src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java
index e076644..1397023 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/data/Responses.java
@@ -16,10 +16,11 @@ import org.apache.log4j.Logger;
 \r
 import com.indexdata.mkjsf.errors.ErrorHelper;\r
 import com.indexdata.mkjsf.errors.ErrorInterface;\r
+import com.indexdata.mkjsf.pazpar2.data.sp.SpResponseDataObject;\r
 import com.indexdata.mkjsf.pazpar2.data.sp.SpResponses;\r
 import com.indexdata.mkjsf.utils.Utils;\r
 \r
-@Named("pzresp") @SessionScoped\r
+@SessionScoped @Named\r
 public class Responses implements Serializable {\r
     \r
   private static final long serialVersionUID = -7543231258346154642L;\r
@@ -44,10 +45,15 @@ public class Responses implements Serializable {
       logger.info("Error detected in search");\r
       return true;\r
     }\r
-    for (String name : dataObjects.keySet()) {\r
+    for (String name : dataObjects.keySet()) {      \r
       if (dataObjects.get(name).hasApplicationError()) {\r
-        logger.info("Error detected in " + name);\r
-        return true;\r
+        if (dataObjects.get(name) instanceof SpResponseDataObject &&\r
+           ((SpResponseDataObject)dataObjects.get(name)).unsupportedCommand()) {\r
+            logger.debug("Command  [" + name + "] not supported by this service");                    \r
+        } else {\r
+          logger.info("Error detected in " + name);\r
+          return true;\r
+        }\r
       }\r
     }    \r
     return false;\r