X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FServiceProxyExtensions.java;h=de1f42a2ab40a6049dd9159fa602777b6661e1ea;hb=a595a87476ba2e84455e37b9709d908aab5d878a;hp=dae3a1761a1264f2608c5907ecd6d652c3db2e9d;hpb=5584e83f4b8d6c66999048dafcb9ce6999808894;p=mkjsf-moved-to-github.git

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