Changeset 2840

Timestamp:

04/26/13 12:33:26 (11 years ago)

Author:

oschonef

Message:

• if operating in non-strict mode, allow empty <details> and <message> elements within <diagnostic>

Location:

SRUClient/trunk/src/main/java/eu/clarin/sru/client

Files:

• SRUSimpleClient.java (modified) (8 diffs)
• SRUXMLStreamReader.java (modified) (1 diff)

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUSimpleClient.java

@@ -576 +576 @@
 
             // explainResponse/diagnostics
-            final List<SRUDiagnostic> diagnostics = parseDiagnostics(reader);
+            final List<SRUDiagnostic> diagnostics =
+                    parseDiagnostics(reader, strictMode);
             if (diagnostics != null) {
                 handler.onDiagnostics(diagnostics);
@@ -725 +726 @@
 
                 // scanResponse/diagnostics
-                final List<SRUDiagnostic> diagnostics = parseDiagnostics(reader);
+                final List<SRUDiagnostic> diagnostics =
+                        parseDiagnostics(reader, strictMode);
                 if (diagnostics != null) {
                     handler.onDiagnostics(diagnostics);
@@ -872 +874 @@
 
                         if (SRU_DIAGNOSTIC_RECORD_SCHEMA.equals(schema)) {
-                            surrogate = parseDiagnostic(recordReader, true);
+                            surrogate = parseDiagnostic(recordReader,
+                                    true, strictMode);
                         } else {
                             SRURecordDataParser parser = findParser(schema);
@@ -1024 +1027 @@
 
                 // searchRetrieveResponse/diagnostics
-                final List<SRUDiagnostic> diagnostics = parseDiagnostics(reader);
+                final List<SRUDiagnostic> diagnostics =
+                        parseDiagnostics(reader, strictMode);
                 if (diagnostics != null) {
                     handler.onDiagnostics(diagnostics);
@@ -1067 +1071 @@
 
     private static List<SRUDiagnostic> parseDiagnostics(
-            SRUXMLStreamReader reader) throws XMLStreamException,
-            SRUClientException {
+            SRUXMLStreamReader reader, boolean strictMode)
+            throws XMLStreamException, SRUClientException {
         if (reader.readStart(SRU_NS, "diagnostics", false)) {
             List<SRUDiagnostic> diagnostics = null;
@@ -1074 +1078 @@
             SRUDiagnostic diagnostic = null;
             while ((diagnostic = parseDiagnostic(reader,
-                    (diagnostics == null))) != null) {
+                    (diagnostics == null), strictMode)) != null) {
                 if (diagnostics == null) {
                     diagnostics = new ArrayList<SRUDiagnostic>();
@@ -1089 +1093 @@
 
     private static SRUDiagnostic parseDiagnostic(SRUXMLStreamReader reader,
-            boolean required) throws XMLStreamException, SRUClientException {
+            boolean required, boolean stictMode) throws XMLStreamException,
+            SRUClientException {
         if (reader.readStart(SRU_DIAGNOSIC_NS, "diagnostic", required)) {
 
@@ -1096 +1101 @@
 
             // diagnostic/details
-            String details =
-                    reader.readContent(SRU_DIAGNOSIC_NS, "details", false);
+            String details = reader.readContent(SRU_DIAGNOSIC_NS, "details",
+                    false, stictMode);
+            if ((details != null) && details.isEmpty()) {
+                details = null;
+                logger.warn("omitting empty element <details> " +
+                        "within element <diagnostic>");
+            }
 
             // diagnostic/message
-            String message =
-                    reader.readContent(SRU_DIAGNOSIC_NS, "message", false);
+            String message = reader.readContent(SRU_DIAGNOSIC_NS, "message",
+                    false, stictMode);
+            if ((message != null) && message.isEmpty()) {
+                message = null;
+                logger.warn("omitting empty element <message> " +
+                        "within element <diagnostic>");
+            }
 
             reader.readEnd(SRU_DIAGNOSIC_NS, "diagnostic");

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUXMLStreamReader.java

@@ -515 +515 @@
     String readContent(String namespaceURI, String localName, boolean required)
             throws XMLStreamException {
+        return readContent(namespaceURI, localName, required, true);
+    }
+
+        
+    String readContent(String namespaceURI, String localName, boolean required,
+            boolean contentRequired) throws XMLStreamException {
         String result = null;
         if (readStart(namespaceURI, localName, required)) {
             try {
-                result = readString(true);
+                result = readString(contentRequired);
+                if (!contentRequired && (result == null)) {
+                    result = "";
+                }
             } catch (XMLStreamException e) {
                 StringBuilder sb = new StringBuilder();