diff --git a/dnet-ariadneplus-container/src/main/resources/eu/dnetlib/cnr-site.properties b/dnet-ariadneplus-container/src/main/resources/eu/dnetlib/cnr-site.properties index 4a15625..51ff6f6 100644 --- a/dnet-ariadneplus-container/src/main/resources/eu/dnetlib/cnr-site.properties +++ b/dnet-ariadneplus-container/src/main/resources/eu/dnetlib/cnr-site.properties @@ -4,7 +4,7 @@ container.port = 8280 services.is.store.database.bean = persistentExistDatabase #services.is.store.database.bean = temporaryExistDatabase -dnet.data.path = /tmp/ariadneplus +dnet.data.path = /var/lib/dnet dnet.bootstrap.schemas = classpath*:/eu/dnetlib/bootstrap/schemas/**/*.xsd dnet.bootstrap.profiles = classpath*:/eu/dnetlib/bootstrap/profiles/**/*.xml diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_api_compatibilities.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_api_compatibilities.xml new file mode 100644 index 0000000..49a9e12 --- /dev/null +++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_api_compatibilities.xml @@ -0,0 +1,24 @@ + +
+ + + + + +
+ + + dnet:compatibilityLevel + API compatibility + + + + + + + + + + + +
\ No newline at end of file diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_api_protocols.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_api_protocols.xml new file mode 100644 index 0000000..c3d1972 --- /dev/null +++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_api_protocols.xml @@ -0,0 +1,72 @@ + +
+ + + + + +
+ + + dnet:protocols + API protocols + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_content_descriptions.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_content_descriptions.xml new file mode 100644 index 0000000..b4376cb --- /dev/null +++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_content_descriptions.xml @@ -0,0 +1,24 @@ + +
+ + + + + +
+ + + D-Net Content Description Typologies + D-Net Content Description Typologies + + + + + + + + + + + +
\ No newline at end of file diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_datasource_typologies.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_datasource_typologies.xml new file mode 100644 index 0000000..ac53c81 --- /dev/null +++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/VocabularyDSResourceType/dnet_datasource_typologies.xml @@ -0,0 +1,25 @@ + +
+ + + + + +
+ + + Datasource typologies + D-Net datasource typologies + + + + + + + + + + + +
\ No newline at end of file diff --git a/dnet-ariadneplus/src/test/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/MultipleIteratorTest.java b/dnet-ariadneplus/src/test/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/MultipleIteratorTest.java new file mode 100644 index 0000000..afa5a2d --- /dev/null +++ b/dnet-ariadneplus/src/test/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/MultipleIteratorTest.java @@ -0,0 +1,33 @@ +package eu.dnetlib.data.collector.plugins.ariadneplus.ads; + +import java.util.List; +import java.util.stream.Stream; + +import org.junit.Assert; +import org.junit.Test; + +import com.google.common.base.Function; +import com.google.common.collect.Iterables; + + +public class MultipleIteratorTest { + + @Test + public void mergeIterators() { + + final List urls = null; + Iterables.concat(Iterables.transform(urls, new Function>() { + + @Override + public Iterable apply(final String url) { + Stream a = Stream.of("1", "2"); + try { + return null; + } catch (final Exception e) { + throw new RuntimeException(String.format("unable to iterate over %s", url), e); + } + } + })).iterator(); + Assert.assertNotNull(""); + } +}