Cleans up SP extension commands

[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 6595059..51ab55b 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -12,13 +12,9 @@ import org.apache.log4j.Logger;
 import org.apache.myfaces.custom.fileupload.UploadedFile;\r
 \r
 import com.indexdata.mkjsf.config.ConfigurationReader;\r
-import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
-import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
-import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;\r
-import com.indexdata.mkjsf.pazpar2.data.sp.SpResponseDataObject;\r
 import com.indexdata.mkjsf.utils.Utils;\r
 \r
 @Named("pz2x") @SessionScoped\r
@@ -37,48 +33,14 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     // TODO: \r
     //stateMgr.addStateListener(this);\r
   }\r
-     \r
-  public void authenticate() {    \r
-    if (Pz2Bean.get().getPzresp().getSp().getAuth().unsupportedCommand()) {\r
-      logger.warn("Running seemingly unsupported command [auth] against SP.");\r
-    }\r
-    Pz2Bean.get().resetSearchAndRecordCommands();\r
-    Pz2Bean.get().getPzresp().getSp().resetAuthAndBeyond(true);\r
-    Pz2Bean.get().getPzreq().getSp().getAuth().run();\r
-  }\r
-  \r
-  public void login(String un, String pw) {      \r
-      login(un,pw,"");\r
-  }\r
-  \r
-  public void login(String un, String pw, String navigateTo) {      \r
-    Pz2Bean.get().getPzreq().getSp().getAuth().setUsername(un);\r
-    Pz2Bean.get().getPzreq().getSp().getAuth().setPassword(pw);\r
-    login("");\r
-  }  \r
-    \r
-  @Override  \r
-  public String login(String navigateTo) {\r
-    AuthCommand auth = Pz2Bean.get().getPzreq().getSp().getAuth(); \r
-    auth.setParameterInState(new CommandParameter("action","=","login"));\r
-    authenticate();\r
-    return navigateTo;\r
-  }\r
-    \r
-  public void ipAuthenticate () {  \r
-    AuthCommand auth = Pz2Bean.get().getPzreq().getSp().getAuth(); \r
-    auth.setParameterInState(new CommandParameter("action","=","ipAuth"));\r
-    authenticate();\r
-  }\r
-      \r
+           \r
   public String getInitDocPath () {\r
     return Pz2Bean.get().getSpClient().getConfiguration().get("INIT_DOC_PATH");\r
   }\r
   \r
   @Override\r
   public void setInitFileName(String fileName) {\r
-    this.initDocFileName = fileName;\r
-    \r
+    this.initDocFileName = fileName;    \r
   }\r
 \r
   @Override\r
@@ -138,31 +100,5 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     return initDocUpload;\r
   }\r
   \r
-  public CategoriesResponse getCategories () {       \r
-    String command="categories";\r
-    if (Pz2Bean.get().isServiceProxyService()) {\r
-      if (Pz2Bean.get().getPzresp().getSp().getCategories().unsupportedCommand()) {\r
-        logger.info("Skipping seemingly unsupported command: " + command);  \r
-        return new CategoriesResponse();\r
-      } else {\r
-        SpResponseDataObject response = (SpResponseDataObject) Pz2Bean.get().getPzreq().getSp().getCategories().run();\r
-        if (response.unsupportedCommand()) {\r
-          logger.warn("Command 'categories' not supported by this Service Proxy");          \r
-        } else if (response.hasApplicationError()) {\r
-          logger.error(response.getXml());            \r
-        }  \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
-    } else {\r
-      return new CategoriesResponse();\r
-    }\r
-  }\r
-  \r
-  \r
+   \r
 }\r