diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 8d2b6ed11f868ad6acde62d29edfd3269869aa42..0263c16d0ce761bbad461aa0c58234f4335740b3 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>2.7.3-SNAPSHOT</version>
+ <version>2.9.1-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
index bbab4bb486be3a8c716430e82d114d5c89e4b452..714a5f3a79f16bbd45e7b9725e49451a848bc78e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
@@ -234,7 +234,7 @@ public final class DublinCoreBuilder {
*/
public void setTitle(List<String> titles){
for (String dctitle : titles) {
- System.out.println("title: " + dctitle);
+// System.out.println("title: " + dctitle);
ElementType titlesElement = new ElementType();
JAXBElement<ElementType> dcCoreTitle = getOaiDcObj().createTitle(titlesElement);
titlesElement.setValue(dctitle);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
index 4b3cd822bfec2b30b1937b11617262d8f6dbfce8..dc1e5a1da32b862d7a723f40ee03161ac226e0a2 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -333,7 +333,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
oai.getError().add(
error.setError(TGConstants.OAI_METADATA_FORMAT_ERROR));
} else {
- System.out.println("bla1000");
+// System.out.println("bla1000");
if (request.getResumptionToken() != null
&& RecordListDeliverer.cursorCollector.containsKey(request
.getResumptionToken())) {
@@ -347,7 +347,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
request.getUntil(), request.getSet(),
request.getResumptionToken());
if (lit != null) {
- System.out.println("bla2000");
+// System.out.println("bla2000");
oai.setListIdentifiers(lit);
} else {
error.setError(TGConstants.OAI_NO_RECORD_MATCH).setValue(
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 792ccbde40e34a468126753cfc35ef263b57f165..42ff5887454902f176f401f2b4af505685af5417 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
@@ -117,7 +117,7 @@ public class RecordDeliverer {
if (id.startsWith(this.repositoryObjectURIPrefix)) {
changedId = changedId.replace(this.repositoryObjectURIPrefix, "");
- System.out.println("CHANGEDID: " + changedId);
+// System.out.println("CHANGEDID: " + changedId);
}
GetRequestBuilder recordById = OAI_ESClient.getOaiESClient()
@@ -127,8 +127,6 @@ public class RecordDeliverer {
GetResponse tgObject = recordById.execute().actionGet();
- //System.out.println(tgObject.getField("administrativeMetadata.dcterms:identifier").getValue());
-
if (tgObject.isExists()) {
String identifier;
@@ -138,9 +136,9 @@ public class RecordDeliverer {
putContentIntoDCFieldLists(tgObject);
// FIXME MAX!!!! DO CONFIGURE!!!!
- System.out.println(identifierField);
+// System.out.println(identifierField);
identifier = tgObject.getField(this.identifierField).getValue().toString();
- System.out.println("IDENTIFIER: " + identifier);
+// System.out.println("IDENTIFIER: " + identifier);
String dateOfCreation = "NO_DATE_SET!";
if (tgObject.getField(this.dateOfObjectCreation) != null) {
@@ -294,7 +292,7 @@ public class RecordDeliverer {
dbc.setFormat(this.formats);
dbc.setIdentifier(this.identifiers);
for(String identifier : identifiers){
- System.out.println("IDENTIFIEROPF: " + identifier);
+// System.out.println("IDENTIFIEROPF: " + identifier);
}
dbc.setLanguage(this.languages);
dbc.setPublisher(this.publishers);
@@ -303,7 +301,7 @@ public class RecordDeliverer {
dbc.setSource(this.sources);
dbc.setSubject(this.subjects);
for(String title : titles){
- System.out.println("TITLEOPF: " + title);
+// System.out.println("TITLEOPF: " + title);
}
dbc.setTitle(this.titles);
dbc.setType(this.types);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
index f67ca181330d584d074d2b2b8d0e6400fc3a630c..31a50f6207e0ece4ba3927dbbea1a573f864e088 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -49,8 +49,8 @@ public class SetDeliverer {
public ListSetsType setListBuilder() {
//System.out.println("HALLO !!!!!!!!!!!!!!!!!!!");
- System.out.println("DARIAH: " + dariah);
- System.out.println("TEXTGRID: " + textgrid);
+// System.out.println("DARIAH: " + dariah);
+// System.out.println("TEXTGRID: " + textgrid);
ListSetsType setList = new ListSetsType();
QueryBuilder aggQuery;
//System.out.println("TEXTGRID: " + textgrid);
@@ -61,7 +61,7 @@ public class SetDeliverer {
aggQuery = QueryBuilders.matchPhraseQuery("descriptiveMetadata.dc:format", TextGridMimetypes.DARIAH_COLLECTION);
}
- System.out.println(aggQuery);
+// System.out.println(aggQuery);
SearchRequestBuilder request = OAI_ESClient.getOaiESClient()
.prepareSearch(OAI_ESClient.getEsIndex())
@@ -81,7 +81,7 @@ public class SetDeliverer {
//System.out.println("HALLO HALLO");
//if(hit.getFields().get(formatField) != null && hit.getFields().get(formatField).value().equals(formatToFilter)) {
//System.out.println("IDENTIFIER FIELD: " + identifierField);
- System.out.println("DARIAH SET");
+// System.out.println("DARIAH SET");
if(dariah == true && hit.getFields().get(identifierField).values().get(0).toString().startsWith("hdl:")){
// System.out.println("JUHU");
this.identifier.add(hit.getFields().get(identifierField).values().get(0).toString());
@@ -103,7 +103,7 @@ public class SetDeliverer {
//}
if(textgrid==true){
- System.out.println("HALLO GRIT");
+// System.out.println("HALLO GRIT");
Iterator it = setSet.entrySet().iterator();
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 4998779a2b4abe86f1ba8a17a7ec5cd9e5d16e6d..5ba37131777252584a4ade920826f57d00dbf026 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>2.7.3-SNAPSHOT</version>
+ <version>2.9.1-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId>
diff --git a/pom.xml b/pom.xml
index 2e6d1b87be4037537e1ca0492424241dda4e56ea..dfa149d65e845d58f01d31dc22a0d1bca44221f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,15 +4,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
- <version>2.7.3-SNAPSHOT</version>
+ <version>2.9.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>DARIAHDE :: OAI-PMH DataProvider</name>
<properties>
+ <tgcrud.version>7.20.0-DH</tgcrud.version>
+ <tghttpclients.version>2.8.0</tghttpclients.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.1.7</cxf.version>
- <tgcrud.version>7.16.0-DH</tgcrud.version>
<spring.version>4.0.2.RELEASE</spring.version>
- <tghttpclients.version>2.6.0</tghttpclients.version>
<jetty.version>6.1.15</jetty.version>
<elasticsearch.version>1.7.5</elasticsearch.version>
<antlr-runtime.version>3.2</antlr-runtime.version>