X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fdata%2FResponseParser.java;h=8036a2992e845de1189d1b5ce9bb8cccb51ad2f9;hb=1ab622be3bcde018e6b7816d4af8b79f80159630;hp=29a5fb724a487484a2c2def958a93af3b263bd5b;hpb=bcb39bd9bde8071ac3a6741ce5d51ed9e763ba9c;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/data/ResponseParser.java b/src/main/java/com/indexdata/mkjsf/pazpar2/data/ResponseParser.java
index 29a5fb7..8036a29 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/data/ResponseParser.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/data/ResponseParser.java
@@ -18,6 +18,17 @@ import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
+import com.indexdata.mkjsf.pazpar2.ClientCommandResponse;
+import com.indexdata.mkjsf.pazpar2.data.sp.AuthResponse;
+import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;
+import com.indexdata.mkjsf.pazpar2.data.sp.TargetCategory;
+
+/**
+ * Parses the XML stored in ClientCommandResponses and builds ResponseDataObjects from it.
+ *  
+ * @author Niels Erik
+ *
+ */
 public class ResponseParser extends DefaultHandler {
 
   private XMLReader xmlReader = null;
@@ -27,8 +38,8 @@ public class ResponseParser extends DefaultHandler {
   private String xml = null;
   private static Logger logger = Logger.getLogger(ResponseParser.class);
 
-  public static List<String> docTypes = Arrays.asList(  "bytarget","termlist","show","stat","record","search","init",
-                                        /* SP extras */ "response" );                                        
+  public static List<String> docTypes = Arrays.asList(  "bytarget","termlist","show","stat","record","search","init","info",
+                                        /* SP extras */ "auth", "categories" );                                        
   
   public ResponseParser() {
     try {
@@ -61,10 +72,10 @@ public class ResponseParser extends DefaultHandler {
    * @param response XML response string from Pazpar2
    * @return Response data object
    */
-  public ResponseDataObject getDataObject (String response) {
-    this.xml = response;
+  public ResponseDataObject getDataObject (ClientCommandResponse response) {
+    this.xml = response.getResponseString();
     try {      
-      xmlReader.parse(new InputSource(new ByteArrayInputStream(response.getBytes("UTF-8"))));
+      xmlReader.parse(new InputSource(new ByteArrayInputStream(response.getResponseToParse())));
     } catch (UnsupportedEncodingException e) {
       e.printStackTrace(); 
     } catch (IOException e) {
@@ -94,7 +105,7 @@ public class ResponseParser extends DefaultHandler {
     } else if (localName.equals("record")) {
       currentElement = new RecordResponse();            
     } else if (localName.equals("bytarget")) {
-      currentElement = new ByTarget();      
+      currentElement = new ByTargetResponse();      
     } else if (localName.equals("target")) {
       currentElement = new Target();
     } else if (localName.equals("stat")) {
@@ -112,12 +123,22 @@ public class ResponseParser extends DefaultHandler {
         currentElement = new TermResponse();
       }
       ((TermListResponse)dataElements.peek()).addTerm((TermResponse)currentElement);
+    } else if (localName.equals("info")) {
+      currentElement = new InfoResponse();
+    } else if (localName.equals("version") && dataElements.peek().getType().equals("info")) {
+      currentElement = new Pazpar2VersionResponse();
     } else if (localName.equals("applicationerror")) {
       currentElement = new CommandError();
     } else if (localName.equals("error") && dataElements.peek().getType().equals("applicationerror")) {
-      currentElement = new Pazpar2Error(); 
-    } else if (localName.equals("response")) {  // Note, document element not named 'auth'
+      currentElement = new ServiceError(); 
+    // Service Proxy extras  
+    } else if (localName.equals("auth")) {  
       currentElement = new AuthResponse();
+    } else if (localName.equals("categories")) {
+      currentElement = new CategoriesResponse();
+    } else if (localName.equals("category") && dataElements.peek().getType().equals("categories")) {
+      currentElement = new TargetCategory();
+    // Catch all
     } else {
       currentElement = new ResponseDataObject();
     }