From de4be8cd78f914e41e619be7ea881415c4004880 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Mon, 31 Oct 2016 16:38:34 +0100
Subject: [PATCH] removed all sysouts. max will add logging
soon!!!!!!!!!!!!!!!!!! :-) version increased.
---
oaipmh-core/pom.xml | 2 +-
.../middleware/IdentifierListDeliverer.java | 31 ++++++++++---------
.../textgrid/middleware/RecordDeliverer.java | 14 ++++-----
.../middleware/RecordListDeliverer.java | 17 +++++-----
.../middleware/RepIdentification.java | 2 +-
.../textgrid/middleware/SetDeliverer.java | 6 ++--
oaipmh-webapp/pom.xml | 2 +-
pom.xml | 2 +-
8 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 4eb9da8f..07c995ea 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.5.8-SNAPSHOT</version>
+ <version>2.5.9-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
index 17ae30dc..29395607 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
@@ -75,15 +75,15 @@ public class IdentifierListDeliverer {
this.textgrid = textgrid;
this.dariah = dariah;
this.oaiEsClient = oaiEsClient;
- System.out.println("DARIAH boolean is set to: " + dariah);
- System.out.println("TEXTGRID boolean is set to: " + textgrid);
+// System.out.println("DARIAH boolean is set to: " + dariah);
+// System.out.println("TEXTGRID boolean is set to: " + textgrid);
}
// FIXME Delete this function and check for empty set string in setListIdentifierHeaderWithSet
private ListIdentifiersType setListIdentifierHeader(String datestamp, String identifier, ListIdentifiersType lit, String set) {
- System.out.println("START HEADER");
+// System.out.println("START HEADER");
HeaderType header = new HeaderType();
header.setDatestamp(datestamp);
header.setIdentifier(identifier);
@@ -93,7 +93,7 @@ public class IdentifierListDeliverer {
}
lit.getHeader().add(header);
- System.out.println("END HEADER");
+// System.out.println("END HEADER");
return lit;
}
@@ -119,19 +119,19 @@ public class IdentifierListDeliverer {
public ListIdentifiersType processIdentifierList(String from, String to, String set, String resumptionToken) throws ParseException {
- System.out.println("JUHU");
+// System.out.println("JUHU");
ListIdentifiersType lit = new ListIdentifiersType();
QueryBuilder query = setOrNot(set, from, to);
SearchResponse listListIdentiferValues;
- System.out.println("JUHU2");
+// System.out.println("JUHU2");
if(resumptionToken != null){
- System.out.println("BLA");
+// System.out.println("BLA");
listListIdentiferValues = OAI_ESClient.getOaiESClient().prepareSearchScroll(resumptionToken).setScroll(new TimeValue(6000)).execute().actionGet();
}
else{
- System.out.println("JUHU3: " + searchResponseSize);
- System.out.println(OAI_ESClient.getClusterName());
+// System.out.println("JUHU3: " + searchResponseSize);
+// System.out.println(OAI_ESClient.getClusterName());
listListIdentiferValues = OAI_ESClient
.getOaiESClient().prepareSearch(OAI_ESClient.getEsIndex())
.setTypes(OAI_ESClient.getEsType())
@@ -141,10 +141,10 @@ public class IdentifierListDeliverer {
.setSize(searchResponseSize)
.execute()
.actionGet();
- System.out.println("DAMDAMDAM");
+// System.out.println("DAMDAMDAM");
}
- System.out.println("JUHU3.5");
+// System.out.println("JUHU3.5");
listListIdentiferValues = hitHandling(listListIdentiferValues, lit, set, listListIdentiferValues.getScrollId());
return lit;
@@ -152,12 +152,12 @@ public class IdentifierListDeliverer {
public SearchResponse hitHandling(SearchResponse listFurtherValues, ListIdentifiersType lit, String set, String resumptionToken){
- System.out.println("JUHU4");
- System.out.println("FOR SET: " + set);
+// System.out.println("JUHU4");
+// System.out.println("FOR SET: " + set);
int i = 0;
for (SearchHit hit : listFurtherValues.getHits().getHits()) {
i++;
- System.out.println("Durchlauf Nummer: " + i);
+// System.out.println("Durchlauf Nummer: " + i);
if (this.textgrid ) {
String datestamp = hit.getFields().get(dateOfObjectCreation).getValue().toString();
@@ -175,7 +175,7 @@ public class IdentifierListDeliverer {
}
if (this.dariah) {
- System.out.println("BLA");
+// System.out.println("BLA");
datestamp = hit.getFields().get(dateOfObjectCreation).getValue().toString();
try {
@@ -356,4 +356,5 @@ public class IdentifierListDeliverer {
this.searchResponseSize = Integer.parseInt(searchResponseSize);
System.out.println(this.searchResponseSize);
}
+
}
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 df2f9850..e9bb862e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
@@ -112,7 +112,7 @@ public class RecordDeliverer {
if (id.startsWith(this.repositoryObjectURIPrefix)) {
changedId = changedId.replace(this.repositoryObjectURIPrefix, "");
- System.out.println("CHANGE ME: " + changedId);
+// System.out.println("CHANGE ME: " + changedId);
}
GetRequestBuilder recordById = OAI_ESClient.getOaiESClient()
@@ -128,13 +128,13 @@ public class RecordDeliverer {
String identifier;
if (this.dariah == true) {
- System.out.println("ID: " + changedId);
+// System.out.println("ID: " + changedId);
putContentIntoDCFieldLists(tgObject);
// FIXME MAX!!!! DO CONFIGURE!!!!
- System.out.println("IDENTIFIER FIELD_ " + identifierField);
- System.out.println(tgObject.getField("admnistrativeMetadata.dcterms:identifier").getValue());
+// System.out.println("IDENTIFIER FIELD_ " + identifierField);
+// System.out.println(tgObject.getField("admnistrativeMetadata.dcterms:identifier").getValue());
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) {
@@ -148,7 +148,7 @@ public class RecordDeliverer {
e.printStackTrace();
}
//dateOfCreation = tgObject.getField(this.dateOfObjectCreation).getValue().toString();
- System.out.println("DATE: M" + dateOfCreation);
+// System.out.println("DATE: M" + dateOfCreation);
}
setRecordHeader(dateOfCreation, identifier, record, dbc);
}
@@ -180,7 +180,7 @@ public class RecordDeliverer {
RecordType record, DublinCoreBuilder dbc) {
HeaderType recordHeader = new HeaderType();
- System.out.println("IDENTIFIRE::: " + identifier);
+// System.out.println("IDENTIFIRE::: " + identifier);
recordHeader.setIdentifier(identifier);
recordHeader.setDatestamp(dateOfCreation);
record.setMetadata(dbc.getDC());
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 8f4c7763..fd538b00 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
@@ -31,7 +31,6 @@ import info.textgrid.middleware.oaipmh.RequestType;
import info.textgrid.middleware.oaipmh.ResumptionTokenType;
/**
- **
* TODO Care about repeatable fields as done in TITLE!
*/
@@ -164,7 +163,7 @@ public class RecordListDeliverer {
public void fetchFields(QueryBuilder query, ListRecordsType recordList, String resumptionToken, String set) throws UnsupportedEncodingException {
- System.out.println("RESTOKEN: "+ resumptionToken);
+// System.out.println("RESTOKEN: "+ resumptionToken);
//SearchResponse getRecordList = null;
String scrollID = "";
SearchResponse scrollResp;
@@ -192,7 +191,7 @@ public class RecordListDeliverer {
.execute()
.actionGet();
- System.out.println("Clustername: " + OAI_ESClient.getClusterName());
+// System.out.println("Clustername: " + OAI_ESClient.getClusterName());
}else{
scrollResp = OAI_ESClient.getOaiESClient().prepareSearchScroll(resumptionToken).setScroll(new TimeValue(600000)).execute().actionGet();
@@ -205,7 +204,7 @@ public class RecordListDeliverer {
//while (true) {
scrollID = scrollResp.getScrollId();
long completeListeSize = scrollResp.getHits().totalHits();
- System.out.println("COMPLETELISTESIZE: " + completeListeSize);
+// System.out.println("COMPLETELISTESIZE: " + completeListeSize);
if (scrollResp != null && completeListeSize > 0) {
setFoundItems(true);
//System.out.println("ÃœBER IF");
@@ -273,7 +272,7 @@ public class RecordListDeliverer {
if(cursor < scrollResp.getHits().getTotalHits()){
- System.out.println("JUHU");
+// System.out.println("JUHU");
resTokenForResponse.setValue(scrollID);
resTokenForResponse.setCompleteListSize(BigInteger.valueOf(scrollResp.getHits().getTotalHits()));
recordList.setResumptionToken(resTokenForResponse);
@@ -380,18 +379,18 @@ public class RecordListDeliverer {
if (set != null) {
//this.set = set;
- System.out.println("SET IS HERE: " + set);
+// System.out.println("SET IS HERE: " + set);
String queryField = "";
String valueField = "";
if (this.dariah == true) {
- System.out.println("GOING INTO DARIAH");
+// System.out.println("GOING INTO DARIAH");
queryField = "descriptiveMetadata.dc:relation";
valueField = set;
}
if (this.textgrid == true) {
- System.out.println("GOING INTO TextGrid");
+// System.out.println("GOING INTO TextGrid");
String[] setParts = set.split(":");
if (setParts[0].equals("project")) {
@@ -449,7 +448,7 @@ public class RecordListDeliverer {
//System.out.println("identifiers: " + this.identifiers.get(0));
if (set != null) {
header.getSetSpec().add(set);
- System.out.println("BLABLUBB");
+// System.out.println("BLABLUBB");
// header.getSetSpec().add(this.collectionTitle);
}
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RepIdentification.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RepIdentification.java
index 66aeb496..0a0ddd1e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RepIdentification.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RepIdentification.java
@@ -48,7 +48,7 @@ public class RepIdentification {
*/
public String getRepositoryName(){
//return TGConstants.TG_REP_NAME;
- System.out.println("testitest" + RepositoryName);
+// System.out.println("testitest" + RepositoryName);
return RepositoryName;
}
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 ef40ccb7..c852771e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -25,7 +25,7 @@ public class SetDeliverer {
this.oaiEsClient = oaiEsClient;
this.textgrid = textgrid;
this.dariah = dariah;
- System.out.println(dariah);
+// System.out.println(dariah);
}
private Set<String> identifier = new LinkedHashSet<String>();
@@ -49,7 +49,7 @@ public class SetDeliverer {
if (textgrid) {
aggQuery = QueryBuilders.matchPhraseQuery("format", "text/tg.edition+tg.aggregation+xml");
}else{
- System.out.println("JUHU");
+// System.out.println("JUHU");
aggQuery = QueryBuilders.matchPhraseQuery("descriptiveMetadata.dc:format", "text/tg.collection+tg.aggregation+xml");
}
@@ -136,7 +136,7 @@ public class SetDeliverer {
setName = setSpec.getField(specField).getValue().toString();
}
}else{
- System.out.println(id + "does not exist");
+// System.out.println(id + "does not exist");
}
SetType set = new SetType();
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 76f7c865..c4a2e1fd 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.5.8-SNAPSHOT</version>
+ <version>2.5.9-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId>
diff --git a/pom.xml b/pom.xml
index 88f47c05..eb239a69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
- <version>2.5.8-SNAPSHOT</version>
+ <version>2.5.9-SNAPSHOT</version>
<packaging>pom</packaging>
<name>DARIAHDE :: OAI-PMH DataProvider</name>
<properties>
--
GitLab