X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FServiceProxyExtensions.java;h=dae3a1761a1264f2608c5907ecd6d652c3db2e9d;hb=5584e83f4b8d6c66999048dafcb9ce6999808894;hp=0ee282552ee8981e62318d86021e9396aea62be3;hpb=bcb39bd9bde8071ac3a6741ce5d51ed9e763ba9c;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 0ee2825..dae3a17 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -69,7 +69,9 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
                               new CommandParameter("username","=",user.getName()),
                               new CommandParameter("password","=",user.getPassword()));
     ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);
-    AuthResponse responseObject = (AuthResponse) (ResponseParser.getParser().getDataObject(commandResponse.getResponseString()));
+    String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");
+    commandResponse.setResponseToParse(renamedResponse);
+    AuthResponse responseObject = (AuthResponse) ResponseParser.getParser().getDataObject(commandResponse);
     if (ResponseParser.docTypes.contains(responseObject.getType())) {
       pzresp.put(auth.getCommandName(), responseObject);
     }
@@ -93,8 +95,10 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
       pzresp.resetAllSessionData();
       AuthCommand auth = pzreq.getSp().getAuth(); 
       auth.setParameterInState(new CommandParameter("action","=","ipAuth"));
-      ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);
-      AuthResponse responseObject = (AuthResponse) (ResponseParser.getParser().getDataObject(commandResponse.getResponseString()));
+      ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);      
+      String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");
+      commandResponse.setResponseToParse(renamedResponse);
+      ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(commandResponse);
       if (ResponseParser.docTypes.contains(responseObject.getType())) {
         pzresp.put(auth.getCommandName(), responseObject);
       }
@@ -107,6 +111,12 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
       }      
     }
   }
+  
+  private String renameResponseElement(String responseString, String newName) {
+    responseString = responseString.replace("<response>", "<" + newName + ">");
+    responseString = responseString.replace("</response>", "</" + newName + ">");
+    return responseString;
+  }
     
   public String getInitDocPath () {
     return pz2.getSpClient().getConfiguration().get("INIT_DOC_PATH");
@@ -156,8 +166,8 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   }
   
   public void submitInitDoc () throws IOException {
-    HttpResponseWrapper response =  initDocUpload.submit();
-    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response.getResponseString());
+    ClientCommandResponse response =  (ClientCommandResponse) initDocUpload.submit();
+    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);
     logger.info("Putting init response to : " + Utils.objectId(pzresp));
     pzresp.put("init", responseObject);
   }
@@ -175,8 +185,4 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   public InitDocUpload getInitDocUpload () {
     return initDocUpload;
   }
-
-  
-  
-  
 }