Adds support for target category command - 'categories'

[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 a442805..5276eef 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,7 +16,7 @@ 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.SpResponses;\r
+import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;\r
 import com.indexdata.mkjsf.utils.Utils;\r
 \r
 @Named("pzresp") @SessionScoped\r
@@ -89,13 +89,14 @@ public class Responses implements Serializable {
     dataObjects = new ConcurrentHashMap<String,ResponseDataObject>();    \r
     resetSearchResponses();\r
     dataObjects.put("init", new InitResponse());\r
+    dataObjects.put("auth", new AuthResponse());\r
+    dataObjects.put("categories", new CategoriesResponse());\r
   }\r
   \r
-  public InitResponse getInit () {\r
-    logger.info("Request to show init response from " + Utils.objectId(this));\r
+  public InitResponse getInit () {    \r
     return ((InitResponse) dataObjects.get("init"));\r
   }\r
-\r
+  \r
   public ShowResponse getShow () {\r
     return ((ShowResponse) dataObjects.get("show"));\r
   }\r
@@ -115,7 +116,7 @@ public class Responses implements Serializable {
   public TermListsResponse getTermLists () {\r
     return ((TermListsResponse) dataObjects.get("termlist"));\r
   }\r
-  \r
+    \r
   public List<TermResponse> getFacetTerms (String facet, int count) {\r
     return (getTermLists().getTermList(facet).getTerms(count));\r
   }\r
@@ -128,6 +129,17 @@ public class Responses implements Serializable {
     return ((ByTarget) dataObjects.get("bytarget"));\r
   }\r
 \r
+  // Service Proxy extras   \r
+  public AuthResponse getAuth () {\r
+    return ((AuthResponse) dataObjects.get("auth"));\r
+  }\r
+\r
+  public CategoriesResponse getCategories() {\r
+    return ((CategoriesResponse) dataObjects.get("categories"));\r
+  }\r
+  // Service Proxy extras\r
+  \r
+\r
   public ResponseDataObject getResponseObject (String name) {\r
     return dataObjects.get(name);\r
   }\r
@@ -139,19 +151,16 @@ public class Responses implements Serializable {
   }\r
   \r
   public String getActiveClients() {    \r
-    if (getShow()!=null) {\r
+    if (getShow()!=null && getShow().getActiveClients().length()>0) {\r
       logger.debug("Active clients: "+getShow().getActiveClients());\r
-      return getShow().getActiveClients();\r
+      return String.valueOf(\r
+                    Math.max(Integer.parseInt(getShow().getActiveClients()),\r
+                             getStat().getActiveClients()));\r
     } else {\r
       return "";\r
     }\r
   }\r
 \r
-  public SpResponses getSp() {\r
-    // TODO:\r
-    return null;\r
-  }\r
-\r
   public void download(String commandName) throws UnsupportedEncodingException, IOException {\r
     logger.info(Utils.objectId(this) + " got a download request for "\r
         + commandName);\r