From c611ed3cd524fd0246e7597560d547f69f184048 Mon Sep 17 00:00:00 2001
From: Maximilian Brodhun <brodhun@sub.uni-goettingen.de>
Date: Fri, 4 Apr 2014 13:36:02 +0200
Subject: [PATCH] only editions will be send
---
oaipmh-core/.classpath | 202 ++++++++++++++----
.../textgrid/middleware/RecordDeliverer.java | 171 ++++++++++++---
.../middleware/RecordListDeliverer.java | 4 +-
.../info/textgrid/middleware/OaiPmhTest.java | 12 +-
4 files changed, 315 insertions(+), 74 deletions(-)
diff --git a/oaipmh-core/.classpath b/oaipmh-core/.classpath
index 966a922d..34f0799f 100644
--- a/oaipmh-core/.classpath
+++ b/oaipmh-core/.classpath
@@ -14,13 +14,25 @@
<attribute value="jar:file:/home/max/.m2/repository/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-javadoc.jar!/" name="javadoc_location"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0.jar" sourcepath="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-sources.jar">
<attributes>
<attribute value="jar:file:/home/max/.m2/repository/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-javadoc.jar!/" name="javadoc_location"/>
@@ -32,9 +44,21 @@
<attribute value="jar:file:/home/max/.m2/repository/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3-javadoc.jar!/" name="javadoc_location"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-sources.jar">
<attributes>
<attribute value="jar:file:/home/max/.m2/repository/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-javadoc.jar!/" name="javadoc_location"/>
@@ -45,7 +69,11 @@
<attribute value="jar:file:/home/max/.m2/repository/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-javadoc.jar!/" name="javadoc_location"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6-sources.jar">
<attributes>
<attribute value="jar:file:/home/max/.m2/repository/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6-javadoc.jar!/" name="javadoc_location"/>
@@ -56,9 +84,13 @@
<attribute value="jar:file:/home/max/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-javadoc.jar!/" name="javadoc_location"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.2.1/httpcore-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.2.1/httpcore-4.2.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpasyncclient/4.0-beta3/httpasyncclient-4.0-beta3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpasyncclient/4.0-beta3/httpasyncclient-4.0-beta3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpasyncclient/4.0-beta3/httpasyncclient-4.0-beta3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.2.1/httpclient-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.2.1/httpclient-4.2.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar">
<attributes>
@@ -70,15 +102,43 @@
<attribute value="jar:file:/home/max/.m2/repository/commons-codec/commons-codec/1.6/commons-codec-1.6-javadoc.jar!/" name="javadoc_location"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar" sourcepath="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" sourcepath="M2_REPO/org/apache/neethi/neethi/3.0.2/neethi-3.0.2-sources.jar">
<attributes>
<attribute value="jar:file:/home/max/.m2/repository/org/apache/neethi/neethi/3.0.2/neethi-3.0.2-javadoc.jar!/" name="javadoc_location"/>
@@ -94,20 +154,72 @@
<attribute value="jar:file:/home/max/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" name="javadoc_location"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/elasticsearch/elasticsearch/0.90.7/elasticsearch-0.90.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/4.5.1/lucene-core-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.5.1/lucene-analyzers-common-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-codecs/4.5.1/lucene-codecs-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queries/4.5.1/lucene-queries-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-memory/4.5.1/lucene-memory-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-highlighter/4.5.1/lucene-highlighter-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queryparser/4.5.1/lucene-queryparser-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-sandbox/4.5.1/lucene-sandbox-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-suggest/4.5.1/lucene-suggest-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-misc/4.5.1/lucene-misc-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-join/4.5.1/lucene-join-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-grouping/4.5.1/lucene-grouping-4.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-spatial/4.5.1/lucene-spatial-4.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/elasticsearch/elasticsearch/0.90.7/elasticsearch-0.90.7.jar" sourcepath="M2_REPO/org/elasticsearch/elasticsearch/0.90.7/elasticsearch-0.90.7-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/4.5.1/lucene-core-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/4.5.1/lucene-core-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-core/4.5.1/lucene-core-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.5.1/lucene-analyzers-common-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.5.1/lucene-analyzers-common-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-analyzers-common/4.5.1/lucene-analyzers-common-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-codecs/4.5.1/lucene-codecs-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-codecs/4.5.1/lucene-codecs-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-codecs/4.5.1/lucene-codecs-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queries/4.5.1/lucene-queries-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-queries/4.5.1/lucene-queries-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-queries/4.5.1/lucene-queries-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-memory/4.5.1/lucene-memory-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-memory/4.5.1/lucene-memory-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-memory/4.5.1/lucene-memory-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-highlighter/4.5.1/lucene-highlighter-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-highlighter/4.5.1/lucene-highlighter-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-highlighter/4.5.1/lucene-highlighter-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queryparser/4.5.1/lucene-queryparser-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-queryparser/4.5.1/lucene-queryparser-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-queryparser/4.5.1/lucene-queryparser-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-sandbox/4.5.1/lucene-sandbox-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-sandbox/4.5.1/lucene-sandbox-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-sandbox/4.5.1/lucene-sandbox-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-suggest/4.5.1/lucene-suggest-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-suggest/4.5.1/lucene-suggest-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-suggest/4.5.1/lucene-suggest-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-misc/4.5.1/lucene-misc-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-misc/4.5.1/lucene-misc-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-misc/4.5.1/lucene-misc-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-join/4.5.1/lucene-join-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-join/4.5.1/lucene-join-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-join/4.5.1/lucene-join-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-grouping/4.5.1/lucene-grouping-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-grouping/4.5.1/lucene-grouping-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-grouping/4.5.1/lucene-grouping-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-spatial/4.5.1/lucene-spatial-4.5.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-spatial/4.5.1/lucene-spatial-4.5.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-spatial/4.5.1/lucene-spatial-4.5.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/com/spatial4j/spatial4j/0.3/spatial4j-0.3.jar" sourcepath="M2_REPO/com/spatial4j/spatial4j/0.3/spatial4j-0.3-sources.jar">
<attributes>
<attribute value="jar:file:/home/max/.m2/repository/com/spatial4j/spatial4j/0.3/spatial4j-0.3-javadoc.jar!/" name="javadoc_location"/>
@@ -164,9 +276,25 @@
<classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-trig/2.5.0/sesame-rio-trig-2.5.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-nativerdf/2.5.0/sesame-sail-nativerdf-2.5.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-rdbms/2.5.0/sesame-sail-rdbms-2.5.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar" sourcepath="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
</classpath>
\ No newline at end of file
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
index 3e2ef1ba..3cdd9b66 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
@@ -4,6 +4,8 @@ import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.datatype.DatatypeConfigurationException;
+
import org.apache.commons.logging.LogFactory;
import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
@@ -37,6 +39,12 @@ public class RecordDeliverer {
private List<String> descriptions = new ArrayList<String>();
private List<String> formats = new ArrayList<String>();
private List<String> identifiers = new ArrayList<String>();
+ private List<String> languages = new ArrayList<String>();
+ private List<String> publishers = new ArrayList<String>();
+ private List<String> relations = new ArrayList<String>();
+ private List<String> rights = new ArrayList<String>();
+ private List<String> sources = new ArrayList<String>();
+ private List<String> subjects = new ArrayList<String>();
private List<String> titles = new ArrayList<String>();
private List<String> types = new ArrayList<String>();
@@ -63,53 +71,96 @@ public class RecordDeliverer {
*/
public GetRecordType getRecordById(String id){
-
- /*OAI_ESClient esClient = new OAI_ESClient("10.160.254.106", TGConstants.ES_PORT, "tg-search-es-ws4");
- esClient.setEsIndex("textgrid-public-ws4");
- esClient.setEsType("metadata");*/
GetRequestBuilder recordById = oaiEsClient.getOaiESClient().prepareGet()
.setIndex(oaiEsClient.getEsIndex())
.setType(oaiEsClient.getEsType())
- .setFields("dataContributor", "work.spatial", "work.temporal", "work.agent", "format",
- "textgridUri", "created", "work.abstract", "title", "work.type", "work.genre")
+ .setFields("dataContributor", "edition.agent", "format", "created", "textgridUri", "pid", "identifier",
+ "edition.isEditionOf", "edition.source.bibliographicCitation.publisher",
+ "edition.source.bibliographicCitation", "project", "relations.isDerivedFrom",
+ "edition.license", "language", "title")
.setId(id);
-
GetResponse tgObject = recordById.execute().actionGet();
if(tgObject.isExists()){
- contributors.add(tgObject.getField("dataContributor").getValue().toString());
+ String workUri = tgObject.getField("edition.isEditionOf").getValue().toString();
+ workUri = workUri.substring(TGConstants.TG_ITEM_IDENTIFIER_PREFIX.length());
+
+ /*
+ * DC-Contributor
+ */
+ String contributorUnformatted = tgObject.getField("edition.agent").getValue().toString();
+ String contributorFormatted = contributorUnformatted.substring(2, contributorUnformatted.indexOf("id")-2);
+
+ contributors.add(tgObject.getField("dataContributor").getValue().toString());
+ contributors.add(contributorFormatted);
+
+ /*
+ * DC-Format
+ */
+ formats.add(tgObject.getField("format").getValue().toString());
+
+ /*
+ * DC-Identifier
+ */
+ identifiers.add(tgObject.getField("textgridUri").getValue().toString());
- if(tgObject.getField("work.spatial")!=null){
- coverages.add(tgObject.getField("work.spatial").getValue().toString());
- coverages.add(tgObject.getField("work.temporal").getValue().toString());
- }
+ if(tgObject.getFields().get("pid")!=null){
+ identifiers.add(tgObject.getField("pid").getValue().toString());
+ }
- creators.add(tgObject.getField("work.agent").getValue().toString());
+ if(tgObject.getFields().get("identifier")!=null){
+ identifiers.add(tgObject.getField("identifier").getValue().toString());
+ }
- dates.add(tgObject.getField("created").getValue().toString());
+ /*
+ * DC-Languages
+ */
- if(tgObject.getField("work.abstract")!=null){
- descriptions.add(tgObject.getField("created").getValue().toString());
- }
+ if(tgObject.getFields().get("edition.language")!=null){
+ languages.add(tgObject.getField("edition.language").getValue().toString());
+ }
- formats.add(tgObject.getField("format").getValue().toString());
- identifiers.add(tgObject.getField("textgridUri").getValue().toString());
- titles.add(tgObject.getField("title").getValue().toString());
- types.add(tgObject.getField("work.genre").getValue().toString());
- types.add(tgObject.getField("work.type").getValue().toString());
+ /*
+ * DC-Publisher
+ */
+ if(tgObject.getFields().get("edition.source.bibliographicCitation.publisher")!=null){
+ publishers.add(tgObject.getField("edition.source.bibliographicCitation.publisher").getValue().toString());
+ }
-
- try {
- recordHeader.setIdentifier(identifiers.get(0));
- recordHeader.setDatestamp(OAIPMHUtillities.datestampAsString(dates.get(0)));
- } catch (ParseException e) {
- log.debug("Could not parse Datestamp out of: " + dates.get(0));
- }
+ /*
+ * DC-Relation
+ */
+ relations.add(tgObject.getField("project").getValue().toString());
+ relations.add(tgObject.getField("relations.isDerivedFrom").getValue().toString());
- setDCObject(odt, of);
+ /*
+ * DC-Rights
+ */
+ rights.add(tgObject.getField("edition.license").getValue().toString());
+
+ /*
+ * DC-Source
+ */
+ if(tgObject.getField("edition.source.bibliographicCitation").getValue()!=null){
+ sources.add(tgObject.getField("edition.source.bibliographicCitation").getValue().toString());
+ }
+
+ /*
+ * DC-Title
+ */
+ titles.add(tgObject.getField("title").getValue().toString());
+ furtherDCElements(workUri);
+
+ try {
+ recordHeader.setIdentifier(identifiers.get(0));
+ recordHeader.setDatestamp(OAIPMHUtillities.datestampAsString(dates.get(0)));
+ } catch (ParseException e) {
+ log.debug("Could not parse Datestamp out of: " + dates.get(0));
+ }
+ setDCObject(odt, of);
record.setMetadata(dbc.getDC());
record.setHeader(recordHeader);
grt.setRecord(record);
@@ -119,6 +170,59 @@ public class RecordDeliverer {
}
return grt;
+ //listClearer();
+ }
+
+
+
+ public void furtherDCElements(String id){
+
+ GetRequestBuilder getWorkValues = oaiEsClient.getOaiESClient().prepareGet()
+ .setIndex(oaiEsClient.getEsIndex())
+ .setType(oaiEsClient.getEsType())
+ .setId(id)
+ .setFields("work.spatial","work.temporal", "work.agent", "created",
+ "work.abstract", "relations.isDerivedFrom", "textgridUri", "title",
+ "work.subject", "work.genre", "work.type");
+
+
+ GetResponse responseWorkValues = getWorkValues.execute().actionGet();
+
+ if(responseWorkValues.getField("work.spatial")!=null){
+ coverages.add(responseWorkValues.getField("work.spatial").getValue().toString());
+ coverages.add(responseWorkValues.getField("work.temporal").getValue().toString());
+ }
+
+ if(responseWorkValues.getField("work.agent")!=null){
+ creators.add(responseWorkValues.getField("work.agent").getValue().toString());
+ }
+
+ String singleDate = responseWorkValues.getField("created").getValue().toString();
+
+ try {
+ dates.add(OAIPMHUtillities.convertDateFormat(singleDate).toXMLFormat());
+ } catch (ParseException e) {
+ log.debug(e);
+ } catch (DatatypeConfigurationException e) {
+ log.debug(e);
+ }
+
+ if(responseWorkValues.getField("work.abstract")!=null){
+ descriptions.add(responseWorkValues.getField("work.abstract").getValue().toString());
+ }
+
+ if(responseWorkValues.getField("relations.isDerivedFrom")!=null){
+ relations.add(responseWorkValues.getField("relations.isDerivedFrom").getValue().toString());
+ }
+ relations.add(responseWorkValues.getField("title").getValue().toString());
+ relations.add(responseWorkValues.getField("textgridUri").getValue().toString());
+
+ if(responseWorkValues.getField("work.subject")!=null){
+ subjects.add(responseWorkValues.getField("work.subject").getValue().toString());
+ }
+
+ types.add(responseWorkValues.getField("work.genre").getValue().toString());
+ types.add(responseWorkValues.getField("work.type").getValue().toString());
}
@@ -134,8 +238,15 @@ public class RecordDeliverer {
dbc.setCoverage(coverages);
dbc.setCreator(creators);
dbc.setDate(dates);
+ dbc.setDescription(descriptions);
dbc.setFormat(formats);
dbc.setIdentifier(identifiers);
+ dbc.setLanguage(languages);
+ dbc.setPublisher(publishers);
+ dbc.setRelation(relations);
+ dbc.setRights(rights);
+ dbc.setSource(sources);
+ dbc.setSubject(subjects);
dbc.setTitle(titles);
dbc.setType(types);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
index 117b6eaa..aca30115 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
@@ -80,7 +80,8 @@ public class RecordListDeliverer {
for(SearchHit hit : getRecordListItems.getHits().getHits()) {
-
+ if(hit.getFields().get("format").getValue().toString().equals("text/tg.edition+tg.aggregation+xml")){
+
ObjectFactory of = new ObjectFactory();
OaiDcType odt = new OaiDcType();
DublinCoreBuilder newDbc = new DublinCoreBuilder(odt, of);
@@ -191,6 +192,7 @@ public class RecordListDeliverer {
record.setHeader(header);
recordList.getRecord().add(record);
+ }
}
}
else{
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
index 79a108b0..a50a3331 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -32,7 +32,7 @@ public class OaiPmhTest{
/*@Test
- //@Ignore
+ @Ignore
public void testListRecords() throws ParseException{
JAXBElement<OAIPMHType> r = testRequest.getRequest("ListRecords", "", "oai_dc", "", "", "", "");
@@ -48,7 +48,7 @@ public class OaiPmhTest{
JAXBElement<OAIPMHType> r = testRequest.getRequest("ListMetadataFormats", "wr67.0", "", "", "", "", "");
JAXB.marshal(r, System.out);
System.out.println("-----------------------------------\n");
- }
+ }*/
@Test
//@Ignore
@@ -92,14 +92,14 @@ public class OaiPmhTest{
System.out.println("-----------------------------------\n");
}
- @Test
+ /*@Test
//@Ignore
public void testListIdentifiers() throws ParseException{
JAXBElement<OAIPMHType> r = testRequest.getRequest("ListIdentifiers", "", "oai_dc", "", "", "", "");
JAXB.marshal(r, System.out);
System.out.println("-----------------------------------\n");
- }
+ }*/
@Test
//@Ignore
@@ -127,11 +127,11 @@ public class OaiPmhTest{
JAXB.marshal(z, System.out);
System.out.println("-----------------------------------\n");
}
- @Test
+ /* @Test
//@Ignore
public void testGetRequestGetRecordError() throws ParseException{
System.out.println("Test for the verb \"GetRecord\" with succesfull response");
- JAXBElement<OAIPMHType> t = testRequest.getRequest("GetRecord", "wr67.0", "oai_dc", "s", "a", "a", "a");
+ JAXBElement<OAIPMHType> t = testRequest.getRequest("GetRecord", "vqn0.0", "oai_dc", "", "", "", "");
JAXB.marshal(t, System.out);
System.out.println("-----------------------------------\n");
--
GitLab