WIP 2

Author: dr0i

metafacture-io/src/main/java/org/metafacture/io/SruOpener.java

@@ -15,7 +15,6 @@
 import org.xml.sax.SAXException;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -176,10 +175,10 @@ public void process(final String baseUrl) {
 
     private InputStream getXmlDocsViaSru(final StringBuilder srUrl) {
         try {
-            ByteArrayInputStream byteArrayInputStream = retrieve(srUrl, startRecord, maximumRecords);
+            InputStream inputStreamOfURl = retrieveUrl(srUrl, startRecord, maximumRecords);
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder docBuilder = factory.newDocumentBuilder();
-            Document xmldoc = docBuilder.parse(byteArrayInputStream);
+            Document xmldoc = docBuilder.parse(inputStreamOfURl);
 
             Transformer t = TransformerFactory.newInstance().newTransformer();
             StringWriter stringWriter = new StringWriter();
@@ -193,6 +192,7 @@ private InputStream getXmlDocsViaSru(final StringBuilder srUrl) {
             startRecord = nextRecordPosition; // grenzwert : wenn maximumRcords > als in echt
 
             return new ByteArrayInputStream(stringWriter.toString().getBytes());
+
         }
         catch (final IOException | TransformerException | SAXException | ParserConfigurationException e) {
             throw new MetafactureException(e);
@@ -207,7 +207,7 @@ private int getIntegerValueFromElement(final Document xmlDoc, final String tagNa
         return 0;
     }
 
-    private ByteArrayInputStream retrieve(StringBuilder srUrl, int startRecord, int maximumRecords) throws IOException {
+    private InputStream retrieveUrl(StringBuilder srUrl, int startRecord, int maximumRecords) throws IOException {
         final URL urlToOpen =
                 new URL(srUrl.toString() + "&maximumRecords=" + maximumRecords + "&startRecord=" + startRecord);
         final HttpURLConnection connection = (HttpURLConnection) urlToOpen.openConnection();
@@ -218,10 +218,7 @@ private ByteArrayInputStream retrieve(StringBuilder srUrl, int startRecord, int
         }
         InputStream inputStream = getInputStream(connection);
 
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-        inputStream.transferTo(outputStream);
-        return new ByteArrayInputStream(outputStream.toByteArray());
+        return inputStream;
     }
 
     private InputStream getInputStream(final HttpURLConnection connection) {

metafacture-io/src/test/java/org/metafacture/io/SruOpenerTest.java

@@ -44,8 +44,8 @@ public void process(final XmlReceiver obj) {
       //  sruOpener.setQuery("WVN%3D24A05");
         sruOpener.setRecordSchema("MARC21plus-xml");
         sruOpener.setVersion("1.1");
-        sruOpener.setStartRecord("2800");
-        sruOpener.setMaximumRecords("200");
+        sruOpener.setStartRecord("3029");
+        sruOpener.setMaximumRecords("1");
         sruOpener.setTotal("1");
       //  sruOpener.process("https://services.dnb.de/sru/dnb");
         sruOpener.process("https://services.dnb.de/sru/zdb");