diff --git a/src/main/java/de/nrw/hbz/edm/impl/ConsoleImpl.java b/src/main/java/de/nrw/hbz/edm/impl/ConsoleImpl.java index 682532f..2932446 100644 --- a/src/main/java/de/nrw/hbz/edm/impl/ConsoleImpl.java +++ b/src/main/java/de/nrw/hbz/edm/impl/ConsoleImpl.java @@ -41,7 +41,7 @@ public static void main(String[] args) { ConsoleImpl conImpl = new ConsoleImpl(); OaiPmhImpl impl = new OaiPmhImpl(); SerializeOaiPmh exOaiPmh = (SerializeOaiPmh) conImpl.generateExampleOaiPmh(); - // impl.serializeXml(exOaiPmh); + impl.serializeXml(exOaiPmh); if (args != null && args.length > 0) { conImpl.filePath = args[0]; @@ -54,10 +54,10 @@ public static void main(String[] args) { //impl.serializeXml(resultOaiPmh); conImpl.filePath = System.getProperty("user.dir") + System.getProperty("file.separator") + "src/test/resources/ExampleSip/EDM.xml"; - // EdmImpl edmImpl = new EdmImpl(conImpl.filePath); + EdmImpl edmImpl = new EdmImpl(conImpl.filePath); Rdf resultEdm = EdmProvider.deserialize(new File(conImpl.filePath)); logger.debug(resultOaiPmh.getOaiMethod().getRecord().get(0).getMetadata().getRdf().getProvidedCho()); - // edmImpl.serializeXml(resultEdm); + edmImpl.serializeXml(resultEdm); ArrayList isShownByReplacement = new ArrayList<>(); isShownByReplacement.add("https://www.q-terra.de/Part-1/000-0002.csv"); diff --git a/src/main/java/de/nrw/hbz/edm/impl/EdmProvider.java b/src/main/java/de/nrw/hbz/edm/impl/EdmProvider.java index ea4d36b..ee648b6 100644 --- a/src/main/java/de/nrw/hbz/edm/impl/EdmProvider.java +++ b/src/main/java/de/nrw/hbz/edm/impl/EdmProvider.java @@ -4,12 +4,10 @@ package de.nrw.hbz.edm.impl; import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -35,13 +33,14 @@ public class EdmProvider { private Rdf rdf = new DeserializeRdf(); private static InputStream xmlIs = null; + private InputStream conIs = null; /** * Constructor takes serialized EDM as File Object * @param file */ public EdmProvider(File file) { - xmlIs = loadXml(file); + conIs = loadXml(file); } /** diff --git a/src/main/java/de/nrw/hbz/edm/impl/HtmlProvider.java b/src/main/java/de/nrw/hbz/edm/impl/HtmlProvider.java index 69b648e..4a8e072 100644 --- a/src/main/java/de/nrw/hbz/edm/impl/HtmlProvider.java +++ b/src/main/java/de/nrw/hbz/edm/impl/HtmlProvider.java @@ -157,7 +157,7 @@ public File toTempFile() { } public Rdf appendHtmlAggregation(String dsUrl) { - int i = rdf.getAggregation().size(); + // int i = rdf.getAggregation().size(); Aggregation aggregation = new DeserializeAggregation(); aggregation.setEdmAggregatedCHO(new DeserializeResourceAttribute("SplashPage")); aggregation.setEdmIsShownBy(new DeserializeResourceAttribute(dsUrl));