X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FServiceProxyExtensions.java;h=3c0da1094046d55d254da45d6fcf8e0725c31e4b;hb=056883036f0be0d1bf0a06d0f5842d382239adf9;hp=f09176d4e4221d9c3548fc3037dbc8a24067b567;hpb=d400a082759c1a58cb79713f04ab2f3d62bca97c;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 f09176d..3c0da10 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -16,10 +16,10 @@ import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;
 import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;
 import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;
-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.AuthResponse;
 import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;
 import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;
 import com.indexdata.mkjsf.utils.Utils;
@@ -46,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  
@@ -182,24 +182,28 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     return initDocUpload.getIncludeDebug();
   }
   
-  // TODO: Remove when possible
+  // TODO: Remove when obsolete
   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();
+    if (pz2.isServiceProxyService()) {
+      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();
+        }
       }
+    } else {
+      return new CategoriesResponse();
     }
   }