projects
/
mkjsf-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds support for pazpar2 info command
[mkjsf-moved-to-github.git]
/
src
/
main
/
java
/
com
/
indexdata
/
mkjsf
/
pazpar2
/
data
/
ResponseParser.java
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
a26b6ad
..
8036a29
100644
(file)
--- a/
src/main/java/com/indexdata/mkjsf/pazpar2/data/ResponseParser.java
+++ b/
src/main/java/com/indexdata/mkjsf/pazpar2/data/ResponseParser.java
@@
-19,9
+19,16
@@
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
\r
\r
import com.indexdata.mkjsf.pazpar2.ClientCommandResponse;
\r
import org.xml.sax.helpers.DefaultHandler;
\r
\r
import com.indexdata.mkjsf.pazpar2.ClientCommandResponse;
\r
+import com.indexdata.mkjsf.pazpar2.data.sp.AuthResponse;
\r
import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;
\r
import com.indexdata.mkjsf.pazpar2.data.sp.TargetCategory;
\r
\r
import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;
\r
import com.indexdata.mkjsf.pazpar2.data.sp.TargetCategory;
\r
\r
+/**
\r
+ * Parses the XML stored in ClientCommandResponses and builds ResponseDataObjects from it.
\r
+ *
\r
+ * @author Niels Erik
\r
+ *
\r
+ */
\r
public class ResponseParser extends DefaultHandler {
\r
\r
private XMLReader xmlReader = null;
\r
public class ResponseParser extends DefaultHandler {
\r
\r
private XMLReader xmlReader = null;
\r
@@
-31,7
+38,7
@@
public class ResponseParser extends DefaultHandler {
private String xml = null;
\r
private static Logger logger = Logger.getLogger(ResponseParser.class);
\r
\r
private String xml = null;
\r
private static Logger logger = Logger.getLogger(ResponseParser.class);
\r
\r
- public static List<String> docTypes = Arrays.asList( "bytarget","termlist","show","stat","record","search","init",
\r
+ public static List<String> docTypes = Arrays.asList( "bytarget","termlist","show","stat","record","search","init","info",
\r
/* SP extras */ "auth", "categories" );
\r
\r
public ResponseParser() {
\r
/* SP extras */ "auth", "categories" );
\r
\r
public ResponseParser() {
\r
@@
-98,7
+105,7
@@
public class ResponseParser extends DefaultHandler {
} else if (localName.equals("record")) {
\r
currentElement = new RecordResponse();
\r
} else if (localName.equals("bytarget")) {
\r
} else if (localName.equals("record")) {
\r
currentElement = new RecordResponse();
\r
} else if (localName.equals("bytarget")) {
\r
- currentElement = new ByTarget();
\r
+ currentElement = new ByTargetResponse();
\r
} else if (localName.equals("target")) {
\r
currentElement = new Target();
\r
} else if (localName.equals("stat")) {
\r
} else if (localName.equals("target")) {
\r
currentElement = new Target();
\r
} else if (localName.equals("stat")) {
\r
@@
-116,10
+123,14
@@
public class ResponseParser extends DefaultHandler {
currentElement = new TermResponse();
\r
}
\r
((TermListResponse)dataElements.peek()).addTerm((TermResponse)currentElement);
\r
currentElement = new TermResponse();
\r
}
\r
((TermListResponse)dataElements.peek()).addTerm((TermResponse)currentElement);
\r
+ } else if (localName.equals("info")) {
\r
+ currentElement = new InfoResponse();
\r
+ } else if (localName.equals("version") && dataElements.peek().getType().equals("info")) {
\r
+ currentElement = new Pazpar2VersionResponse();
\r
} else if (localName.equals("applicationerror")) {
\r
currentElement = new CommandError();
\r
} else if (localName.equals("error") && dataElements.peek().getType().equals("applicationerror")) {
\r
} else if (localName.equals("applicationerror")) {
\r
currentElement = new CommandError();
\r
} else if (localName.equals("error") && dataElements.peek().getType().equals("applicationerror")) {
\r
- currentElement = new Pazpar2Error();
\r
+ currentElement = new ServiceError();
\r
// Service Proxy extras
\r
} else if (localName.equals("auth")) {
\r
currentElement = new AuthResponse();
\r
// Service Proxy extras
\r
} else if (localName.equals("auth")) {
\r
currentElement = new AuthResponse();
\r