Changeset 2022

Timestamp:

07/10/12 13:25:03 (12 years ago)

Author:

oschonef

Message:

• fix breakage (misplaces curly braces)

File:

• SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUClient.java (modified) (4 diffs)

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

@@ -452 +452 @@
                 reader.readEnd(SRU_NS, "terms");
                 handler.onFinishTerms();
-
-                // scanResponse/echoedScanRequest
-                if (reader.readStart(SRU_NS, "echoedScanRequest", false)) {
-                    reader.readEnd(SRU_NS, "echoedScanRequest", true);
-                }
-
-                // scanResponse/diagnostics
-                final List<SRUDiagnostic> diagnostics =
-                        parseDiagnostics(reader);
-                if (diagnostics != null) {
-                    handler.onDiagnostics(diagnostics);
-                }
-
-                // scanResponse/extraResponseData
-                if (reader.readStart(SRU_NS, "extraResponseData", false)) {
-                    reader.consumeWhitespace();
-                    proxy.reset(reader);
-                    try {
-                        handler.onExtraResponseData(proxy);
-                    } catch (XMLStreamException e) {
-                        throw new SRUClientException("handler triggered " +
-                                "error while parsing 'extraResponseData'", e);
-                    }
-                    reader.consumeWhitespace();
-                    reader.readEnd(SRU_NS, "extraResponseData", true);
-                }
-
-                reader.readEnd(SRU_NS, "scanResponse");
-            }
+            }
+
+            // scanResponse/echoedScanRequest
+            if (reader.readStart(SRU_NS, "echoedScanRequest", false)) {
+                reader.readEnd(SRU_NS, "echoedScanRequest", true);
+            }
+
+            // scanResponse/diagnostics
+            final List<SRUDiagnostic> diagnostics = parseDiagnostics(reader);
+            if (diagnostics != null) {
+                handler.onDiagnostics(diagnostics);
+            }
+
+            // scanResponse/extraResponseData
+            if (reader.readStart(SRU_NS, "extraResponseData", false)) {
+                reader.consumeWhitespace();
+                proxy.reset(reader);
+                try {
+                    handler.onExtraResponseData(proxy);
+                } catch (XMLStreamException e) {
+                    throw new SRUClientException("handler triggered "
+                            + "error while parsing 'extraResponseData'", e);
+                }
+                reader.consumeWhitespace();
+                reader.readEnd(SRU_NS, "extraResponseData", true);
+            }
+
+            reader.readEnd(SRU_NS, "scanResponse");
         } catch (XMLStreamException e) {
             throw new SRUClientException(e.getMessage(), e);
@@ -644 +643 @@
                     reader.readEnd(SRU_NS, "record");
                 } // while
-
                 reader.readEnd(SRU_NS, "records");
-                int nextRecordPosition = reader.readContent(SRU_NS,
-                        "nextRecordPosition", false, -1);
-                logger.debug("nextRecordPosition = {}", nextRecordPosition);
-                handler.onFinishRecords(nextRecordPosition);
-
-                // searchRetrieveResponse/echoedSearchRetrieveResponse
-                if (reader.readStart(SRU_NS, "echoedSearchRetrieveRequest", false)) {
-                    reader.readEnd(SRU_NS, "echoedSearchRetrieveRequest", true);
-                }
-
-                // searchRetrieveResponse/diagnostics
-                final List<SRUDiagnostic> diagnostics =
-                            parseDiagnostics(reader);
-                if (diagnostics != null) {
-                    handler.onDiagnostics(diagnostics);
-                }
-
-                // explainResponse/extraResponseData
-                if (reader.readStart(SRU_NS, "extraResponseData", false)) {
-                    reader.consumeWhitespace();
-                    proxy.reset(reader);
-                    try {
-                        handler.onExtraResponseData(proxy);
-                    } catch (XMLStreamException e) {
-                        throw new SRUClientException("handler triggered " +
-                                "error while parsing 'extraResponseData'", e);
-                    }
-                    reader.consumeWhitespace();
-                    reader.readEnd(SRU_NS, "extraResponseData", true);
-                }
-
-                reader.readEnd(SRU_NS, "searchRetrieveResponse");
-            }
+            }
+
+            int nextRecordPosition = reader.readContent(SRU_NS,
+                    "nextRecordPosition", false, -1);
+            logger.debug("nextRecordPosition = {}", nextRecordPosition);
+            handler.onFinishRecords(nextRecordPosition);
+
+            // searchRetrieveResponse/echoedSearchRetrieveResponse
+            if (reader.readStart(SRU_NS, "echoedSearchRetrieveRequest", false)) {
+                reader.readEnd(SRU_NS, "echoedSearchRetrieveRequest", true);
+            }
+
+            // searchRetrieveResponse/diagnostics
+            final List<SRUDiagnostic> diagnostics = parseDiagnostics(reader);
+            if (diagnostics != null) {
+                handler.onDiagnostics(diagnostics);
+            }
+
+            // explainResponse/extraResponseData
+            if (reader.readStart(SRU_NS, "extraResponseData", false)) {
+                reader.consumeWhitespace();
+                proxy.reset(reader);
+                try {
+                    handler.onExtraResponseData(proxy);
+                } catch (XMLStreamException e) {
+                    throw new SRUClientException("handler triggered "
+                            + "error while parsing 'extraResponseData'", e);
+                }
+                reader.consumeWhitespace();
+                reader.readEnd(SRU_NS, "extraResponseData", true);
+            }
+
+            reader.readEnd(SRU_NS, "searchRetrieveResponse");
         } catch (XMLStreamException e) {
             throw new SRUClientException(e.getMessage(), e);
@@ -703 +701 @@
             SRUXMLStreamReader reader) throws XMLStreamException,
             SRUClientException {
+        logger.debug("XXX: try diagnostics: {}", reader.dumpState());
         if (reader.readStart(SRU_NS, "diagnostics", false)) {
             List<SRUDiagnostic> diagnostics = null;
@@ -725 +724 @@
             boolean required) throws XMLStreamException, SRUClientException {
         if (reader.readStart(SRU_DIAGNOSIC_NS, "diagnostic", required)) {
+
             // diagnostic/uri
             String uri = reader.readContent(SRU_DIAGNOSIC_NS, "uri", true);