Hacks login method to make mk2jsf demo work for now.

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
index dae3a17..de1f42a 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -20,6 +20,7 @@ import com.indexdata.mkjsf.pazpar2.data.AuthResponse;
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
 import com.indexdata.mkjsf.pazpar2.data.Responses;\r
+import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;\r
 import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;\r
 import com.indexdata.mkjsf.utils.Utils;\r
 \r
@@ -45,18 +46,18 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     //stateMgr.addStateListener(this);\r
   }\r
    \r
-  /*\r
+\r
   public void login(String un, String pw) {\r
-    if (user.isAuthenticated() && user.getName().equals(un) && pz2.spClient.checkAuthentication(user)) {\r
+    if (user.isAuthenticated() && user.getName().equals(un) /* && pz2.spClient.checkAuthentication(user) */) {\r
       logger.info("Repeat request from UI to authenticate user. Auth verified for given user name so skipping log-in.");\r
     } else {\r
       logger.info("doing un/pw login");\r
       user.setName(un);\r
       user.setPassword(pw);\r
-      login("dummy");\r
+      login("");\r
     }\r
   }\r
-  */\r
+\r
 \r
   \r
   @Override  \r
@@ -185,4 +186,22 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   public InitDocUpload getInitDocUpload () {\r
     return initDocUpload;\r
   }\r
+  \r
+  public CategoriesResponse getCategories () {\r
+    ResponseDataObject response = pz2.doCommand("categories");\r
+    if (response.hasApplicationError()) {\r
+      logger.debug(response.getXml());\r
+      return new CategoriesResponse();\r
+    } else {\r
+      try {\r
+        return (CategoriesResponse) response;\r
+      } catch (Exception e) {\r
+        e.printStackTrace();\r
+        logger.debug(response.getXml());\r
+        return new CategoriesResponse();\r
+      }\r
+    }\r
+  }\r
+  \r
+  \r
 }\r