Changeset 5785 for SRUClient

Timestamp:

11/07/14 15:07:37 (10 years ago)

Author:

Oliver Schonefeld

Message:

• fix parsing of extra response data

Location:

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

Files:

• SRUClient.java (modified) (2 diffs)
• SRUSimpleClient.java (modified) (3 diffs)

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

@@ -293 +293 @@
         public void onExtraResponseData(XMLStreamReader reader)
                 throws XMLStreamException, SRUClientException {
-            final List<SRURecord> records = SRUClient.this.records;
-            if ((records != null) && !records.isEmpty()) {
-                final SRURecord record = records.get(records.size() - 1);
-                record.setExtraRecordData(copyStaxToDocumentFragment(
-                        documentBuilder, stack, reader));
-            } else {
-                /*
-                 * should never happen ...
-                 */
-                throw new SRUClientException(
-                        "internal error; 'records' are null or empty");
-            }
+            SRUClient.this.extraResponseData =
+                    copyStaxToDocumentFragment(documentBuilder, stack, reader);
         }
 
@@ -370 +360 @@
                 XMLStreamReader reader) throws XMLStreamException,
                 SRUClientException {
-            extraResponseData =
-                    copyStaxToDocumentFragment(documentBuilder, stack, reader);
+            final List<SRURecord> records = SRUClient.this.records;
+            if ((records != null) && !records.isEmpty()) {
+                final SRURecord record = records.get(records.size() - 1);
+                record.setExtraRecordData(copyStaxToDocumentFragment(
+                        documentBuilder, stack, reader));
+            } else {
+                /*
+                 * should never happen ...
+                 */
+                throw new SRUClientException(
+                        "internal error; 'records' are null or empty");
+            }
         }
 

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

@@ -562 +562 @@
                     proxy.reset(reader);
                     try {
+                        logger.debug("parsing extra response data");
                         handler.onExtraRecordData(null, -1, proxy);
                     } catch (XMLStreamException e) {
@@ -614 +615 @@
                 proxy.reset(reader);
                 try {
+                    logger.debug("parsing extra response data");
                     handler.onExtraResponseData(proxy);
                 } catch (XMLStreamException e) {
@@ -793 +795 @@
                     proxy.reset(reader);
                     try {
+                        logger.debug("parsing extra response data");
                         handler.onExtraResponseData(proxy);
                     } catch (XMLStreamException e) {