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 35dc7c8e80882876e01d0abc2379e224f1dc793b..351074451972ed2d901f7c23cb19ee71bdd9eb80 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
@@ -4,8 +4,6 @@ import java.text.ParseException;
import java.util.List;
import javax.xml.bind.JAXBElement;
import javax.xml.datatype.DatatypeConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import info.textgrid.middleware.oaipmh.ElementType;
import info.textgrid.middleware.oaipmh.MetadataType;
import info.textgrid.middleware.oaipmh.OaiDcType;
@@ -26,8 +24,6 @@ import info.textgrid.middleware.oaipmh.ObjectFactory;
public final class DublinCoreBuilder {
- private static Log log = LogFactory.getLog(RecordListDelivererAbstract.class);
-
// Object factory for all the DC elements.
private static ObjectFactory oaiDcObj = new ObjectFactory();
@@ -167,13 +163,9 @@ public final class DublinCoreBuilder {
*/
public void setIdentifier(List<String> identifiers) {
- log.debug("idlist: " + (identifiers == null ? "NULL" : identifiers));
-
if (identifiers != null) {
for (String dcidentifier : identifiers) {
- log.debug("id: " + dcidentifier);
-
ElementType identifierElement = new ElementType();
identifierElement.setValue(dcidentifier);
JAXBElement<ElementType> dcCoreIdentifier = oaiDcObj.createIdentifier(identifierElement);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
index ebadcab036470c0a96ef51273bd5a1b6f035a9fb..b1ded25337031293c42c03ec99bfcdf5d150a4be 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
@@ -69,7 +69,6 @@ public class DublinCoreFieldLoader {
} catch (ParseException e) {
// FIXME DO NOT USE INVALID DATE HERE!
dates.add(responseWorkValues.getField(field).getValue().toString());
- log.debug(e);
log.debug("Tried to parse date value: "
+ responseWorkValues.getField(field).getValue().toString());
} catch (DatatypeConfigurationException e) {
@@ -77,7 +76,6 @@ public class DublinCoreFieldLoader {
dates.add(responseWorkValues.getField(field).getValue().toString());
log.debug("Tried to configure date value: "
+ responseWorkValues.getField(field).getValue().toString());
- log.debug(e);
}
}
}
@@ -94,8 +92,6 @@ public class DublinCoreFieldLoader {
List<String> dates = new ArrayList<String>();
- log.debug("TADAAAAAAA! (tadaaaaa?)");
-
for (String field : fields) {
if (hit.getFields().get(field) != null) {
try {
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java
index 32def671515411d0bd2dab7df089b78ad40a7744..033608ef3dc29587a1a1e7e467f65607709c754e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java
@@ -78,7 +78,6 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
this.setUntil(to);
for(int i=0; i<mediaList.length(); i++){
ImageMetsMods imm = new ImageMetsMods(mediaList.getJSONObject(i));
- System.out.println(mediaList.getJSONObject(i).get("id").toString());
RecordType record = new RecordType();
MetadataType metadataMets = new MetadataType();
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
index 1be5993c72d5000f56c7c73d6ef534b99a1ef0be..a5266fd7f871e1f8e5e66a99826ba44da02510c1 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -131,13 +131,8 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
long size = listFurtherValues.getHits().totalHits;
setResultSize(size);
- log.debug("hits: " + size);
-
for (SearchHit hit : listFurtherValues.getHits().getHits()) {
i++;
-
- log.debug("hit " + i + ": " + hit.getId());
-
// Handle TextGrid.
if (this.textgrid) {
String datestamp = hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
@@ -154,20 +149,12 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
// Handle DARIAH.
else if (this.dariah) {
-
- log.debug("dateOfObjectCreation: " + this.dateOfObjectCreation);
-
JSONObject json = new JSONObject(hit.getSourceAsMap());
// Get modifiedDate field and convert datestamp.
this.datestamp = OAIPMHUtilities.fieldLoader(json, this.dateOfObjectCreation);
try {
- log.debug("datestamp: " + this.datestamp);
-
this.datestamp = OAIPMHUtilities.convertDateFormat(this.datestamp).toXMLFormat();
-
- log.debug("datestamp converted: " + this.datestamp);
-
} catch (ParseException e) {
log.error(e.getMessage());
// FIXME Go to ERROR state!
@@ -178,9 +165,6 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
// Get identifier field.
String identifier = OAIPMHUtilities.fieldLoader(json, this.identifierField);
-
- log.debug("identifier: " + identifier);
-
lit = setListIdentifierHeader(this.datestamp, identifier, lit, set);
}
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
index 25962f4b3de4da2c355d27712650b1ca938fe253..1017d416171539d12665dbd2469c722cac857449 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
@@ -121,9 +121,6 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
i++;
String textgridURI =
OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), "textgridUri");
- // hit.getFields().get("textgridUri").getValue().toString().replace(".0", "");
-
- log.debug("TextGrid URI: " + textgridURI);
RecordDelivererIDIOM idiomRecord = new RecordDelivererIDIOM(true, false);
@@ -131,12 +128,6 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
.add(idiomRecord.getRecordById(textgridURI.replace(".0", "")).getRecord().getHeader());
}
- /*
- * for (String artefactURI : artefactURIs) { RecordDelivererIDIOM idiomRecord = new
- * RecordDelivererIDIOM(true, false); identifierList.getHeader()
- * .add(idiomRecord.getRecordById(artefactURI).getRecord().getHeader()); i++; }
- */
-
// Check the need for a resumption token!
ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
resumptionToken, cursorCollector, scrollID, this.idiomResponseSize, i);
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 b462a525d5b17f442f187509890ee56d8445d54d..6a0a61f249ff94b093f3dd3f02d4c42b325e158f 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -13,7 +13,6 @@ import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
import info.textgrid.middleware.oaipmh.GetRecordType;
import info.textgrid.middleware.oaipmh.IdentifyType;
@@ -137,9 +136,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
this.metadataFormatList = metadataFormatList;
- this.log
- .debug("MetadataFormatList implementing class: " + metadataFormatList.getClass().getName());
-
this.setList = setList;
this.imageList = imageList;
}
@@ -382,24 +378,17 @@ public class OAIPMHImpl implements OAIPMHProducer {
&& IdentifierListDelivererDC.cursorCollector
.containsKey(request.getResumptionToken())) {
idListDeliv = this.identifierListDC;
-
- this.log.debug("DC collector: " + IdentifierListDelivererDC.cursorCollector);
}
// Token is from IDIOM request.
else if (IdentifierListDelivererIDIOM.cursorCollector != null
&& IdentifierListDelivererIDIOM.cursorCollector
.containsKey(request.getResumptionToken())) {
- idListDeliv = this.identifierListIDIOM;
-
- this.log.debug("IDIOM collector: " + IdentifierListDelivererIDIOM.cursorCollector);
- }
+ idListDeliv = this.identifierListIDIOM; }
// Token is from DATACITE request.
else if (IdentifierListDelivererDATACITE.cursorCollector != null
&& IdentifierListDelivererDATACITE.cursorCollector
.containsKey(request.getResumptionToken())) {
idListDeliv = this.identifierListDATACITE;
-
- this.log.debug("DATACITE collector: " + IdentifierListDelivererDATACITE.cursorCollector);
}
// Token is from IDIOMImages request.
else if (IDIOMImages.cursorCollector != null
@@ -408,8 +397,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
idListDeliv = imm;
imm.setKindID("1");
imm.setPerPage("100");
- imm.setPageNumber(Integer.toString(IDIOMImages.cursorCollector.get(request.getResumptionToken())));
- this.log.debug("IDIOMImage collector: " + IDIOMImages.cursorCollector);
+ imm.setPageNumber(Integer.toString(IDIOMImages.cursorCollector.get(request.getResumptionToken())));
}
// We have got an invalid resumptionToken here!
else {
@@ -423,9 +411,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
ListIdentifiersType listIdentifiers = null;
try {
- this.log.debug("GET FROM: " + request.getFrom());
- this.log.debug("GET UNTIL: " + request.getUntil());
-
listIdentifiers = idListDeliv.processIdentifierList(request.getFrom(), request.getUntil(),
request.getSet(), request.getResumptionToken());
} catch (IOException e) {
@@ -501,9 +486,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
public OAIPMHtype listMetadataFormatsRequest(String id, OAIPMHtype oaipmhRoot,
RequestType request) {
- this.log.debug("request: " + request.getValue());
- this.log.debug("id: " + id);
-
List<String> errorValues = new ArrayList<String>();
ListMetadataFormatsType listMF = new ListMetadataFormatsType();
@@ -595,23 +577,17 @@ public class OAIPMHImpl implements OAIPMHProducer {
if (RecordListDelivererDC.cursorCollector != null
&& RecordListDelivererDC.cursorCollector.containsKey(request.getResumptionToken())) {
recListDeliv = this.recordListDC;
-
- this.log.debug("DC collector: " + RecordListDelivererDC.cursorCollector);
}
// Token is from IDIOM request.
else if (RecordListDelivererIDIOM.cursorCollector != null
&& RecordListDelivererIDIOM.cursorCollector.containsKey(request.getResumptionToken())) {
recListDeliv = this.recordListIDIOM;
-
- this.log.debug("IDIOM collector: " + RecordListDelivererIDIOM.cursorCollector);
}
// Token is from DATACITE request.
else if (RecordListDelivererDATACITE.cursorCollector != null
&& RecordListDelivererDATACITE.cursorCollector
.containsKey(request.getResumptionToken())) {
recListDeliv = this.recordListDATACITE;
-
- this.log.debug("DATACITE collector: " + RecordListDelivererDATACITE.cursorCollector);
}
// Token is from DATACITE request.
else if (IDIOMImages.cursorCollector != null
@@ -621,8 +597,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
imm.setPerPage("100");
imm.setPageNumber(Integer.toString(IDIOMImages.cursorCollector.get(request.getResumptionToken())));
recListDeliv = imm;
-
- this.log.debug("IDIOMImages collector: " + IDIOMImages.cursorCollector);
}
// We have got an invalid resumptionToken here!
else {
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAI_ESClient.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAI_ESClient.java
index a22a718248a3cd866875ae8facb2c75ae8bb739c..0374d2ec03133aefeecbe485b62f19e0dc4c052a 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAI_ESClient.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAI_ESClient.java
@@ -2,8 +2,6 @@ package info.textgrid.middleware;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpHost;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestHighLevelClient;
@@ -20,7 +18,6 @@ import org.elasticsearch.client.RestHighLevelClient;
*/
public class OAI_ESClient {
- private Log log = LogFactory.getLog(OAI_ESClient.class);
private static String url;
private static int[] ports;
private static String esCluster;
@@ -40,16 +37,9 @@ public class OAI_ESClient {
// int port = Integer.parseInt(thePort);
- /*
- * this.log.info("ElasticSearch connection settings:"); this.log.info("url = " + url);
- * this.log.info("port = " + port); this.log.info("cluster name = " + clusterName);
- */
-
OAI_ESClient.setUrl(url);
-
OAI_ESClient.setPorts(ports);
-
List<HttpHost> hosts = new ArrayList<HttpHost>();
for (int port : ports) {
hosts.add(new HttpHost(url, port, "http"));
@@ -59,8 +49,6 @@ public class OAI_ESClient {
RestClient.builder(
hosts.toArray(new HttpHost[hosts.size()]))));
- this.log.info(
- "ElasticSearchClient started with settings: " + url + " ," + ports.toString() + " http");
}
/**
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java
index 7b0a94aad214cd3d1278c1a92b1544efdb60ee59..a9506403e79741cf98b812bc6acca767ebee748d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java
@@ -107,9 +107,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
throws ParseException, DatatypeConfigurationException, IOException {
String replacedID = idInElasticSearchIndex.replace(this.repositoryObjectURIPrefix, "");
-
- log.debug("idInElasticSearchIndex: " + idInElasticSearchIndex + " = " + replacedID);
-
GetRecordType getRecordType = new GetRecordType();
// Get ES object.
@@ -122,8 +119,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
"No data could be retrieved from ElasticSearch for ID: " + idInElasticSearchIndex);
}
- log.debug("jsonObject: " + this.jsonObj);
-
// Set response header.
String datestamp = OAIPMHUtilities
.datestampAsString(OAIPMHUtilities.fieldLoader(this.jsonObj, this.dateOfObjectCreation));
@@ -135,13 +130,9 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
identifier = idInElasticSearchIndex;
}
- log.debug("specField: " + this.specField);
-
String setSpec = OAIPMHUtilities.fieldLoader(this.jsonObj, this.specField);
String setSpecValue = OAIPMHUtilities.getSetSpec(setSpec, this.specFieldPrefix, identifier);
- log.debug("setSpec: " + setSpec);
-
HeaderType header =
OAIPMHUtilities.computeTheF______Header(datestamp, identifier, setSpecValue);
getRecordType = OAIPMHUtilities.getRecordType(this.setOpenAireRecord(), header);
@@ -194,12 +185,8 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
private Sizes addSize() {
Sizes sizes = new Sizes();
- log.debug("sizeField: " + this.oarSizeField);
-
String size = OAIPMHUtilities.fieldLoader(this.jsonObj, this.oarSizeField) + " Bytes";
- log.debug("size: " + size);
-
sizes.getSize().add(size);
return sizes;
@@ -237,8 +224,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String s : sList) {
Subject subject = new Subject();
- log.debug("subject: " + s);
-
subject.setValue(s);
// TODO Extract subject schema and schema URI somehow?
// subject.setSchemeURI();
@@ -309,16 +294,12 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
else if (this.dariah) {
- log.debug("oarFormatFields: " + this.oarFormatFields.length);
-
for (String format : this.oarFormatFields) {
// Only the first value is taken here! We do not need to create a list!
// TODO Please see addLanguage(), maybe do it as done there to use the other fielsLoader()
// method!
String resourceValue = OAIPMHUtilities.fieldLoader(this.jsonObj, format);
- log.debug("resourceType/value: " + format + "/" + resourceValue);
-
resourceType.setValue(resourceValue);
// Set collection for DARIAH collection type here, data object for everything else.
if (TextGridMimetypes.DARIAH_COLLECTION.equals(format)) {
@@ -370,8 +351,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String relatedIdentifierField : this.oarRelatedIdentifierFields) {
- log.debug("relatedIdentifierField: " + relatedIdentifierField);
-
// **
// TextGrid
// *
@@ -407,8 +386,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {relatedIdentifierField});
for (String i : relatedIdentiferList) {
- log.debug("i: " + i);
-
RelatedIdentifier relatedID = new RelatedIdentifier();
if (i.startsWith(RDFConstants.HDL_PREFIX)) {
relatedID.setRelatedIdentifierType(RelatedIdentifierType.HANDLE);
@@ -465,11 +442,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String d : abstractsFromWork) {
Description description = new Description();
description.setDescriptionType(OpenaireDescriptionType.ABSTRACT);
-
- log.debug("description: " + descriptionField);
- log.debug("relationToWorkObject: " + this.relationToWorkObject);
- log.debug("abstract for work: " + d);
-
description.getContent().add(d);
descriptions.getDescription().add(description);
}
@@ -486,8 +458,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
List<String> descriptionsFromMetadata =
OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {descriptionField});
- log.debug("descriptions: " + descriptionsFromMetadata);
-
// Create abstract for every dc:description.
for (String d : descriptionsFromMetadata) {
Description description = new Description();
@@ -538,8 +508,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String r : rList) {
- log.debug("right: " + r);
-
// Set rights URI assuming every "http://" or "https://" really IS an URI.
if (r.startsWith("http")) {
rights.setRightsURI(r);
@@ -691,9 +659,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
else if (this.dariah) {
- log.debug("field: " + contributorField);
- log.debug("entry: " + OAIPMHUtilities.fieldLoader(this.jsonObj, contributorField));
-
List<String> contributorList =
OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {contributorField});
for (String i : contributorList) {
@@ -723,8 +688,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String dateField : this.oarDateFields) {
- log.debug("dateField: " + dateField);
-
Date dateInOpenAireRecord = new Date();
// NOTE Date must be taken from oar date fields, not from dateOfObjectCration! That only must
@@ -740,8 +703,6 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
.toXMLFormat();
dateInOpenAireRecord.setValue(dateValue);
- log.debug("dateValue: " + dateValue);
-
// TODO Use extra created, issued, and updated fields in configuration!
// Filter TextGrid values for date type.
@@ -846,19 +807,12 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
else if (this.dariah) {
- log.debug("oarCreatorFields: " + this.oarCreatorFields);
-
for (String cFields : this.oarCreatorFields) {
- log.debug("creator fields: " + cFields);
-
List<String> creatorsList =
OAIPMHUtilities.fieldLoader(this.jsonObj, this.oarCreatorFields);
for (String c : creatorsList) {
Creator creator = new Creator();
-
- log.debug("creator: " + c);
-
creator.setCreatorName(c);
creators.getCreator().add(creator);
}
@@ -876,12 +830,8 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
Titles titles = new Titles();
- log.debug("oarTitleFields: " + this.oarTitleFields);
-
for (String titleField : this.oarTitleFields) {
- log.debug("titleField: " + titleField);
-
List<String> titleList = OAIPMHUtilities.fieldLoader(this.jsonObj, this.oarTitleFields);
for (String title : titleList) {
Title tileInOpenAireRecord = new Title();
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
index b2f05e3700b41b1fa723ccec906eabd416905ee6..6ff64cec575d51147ca84616d846ac00d36fd8af 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
@@ -5,8 +5,6 @@ import java.io.StringReader;
import java.text.ParseException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.classicmayan.tools.ClassicMayanMetsMods;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse;
@@ -31,8 +29,6 @@ import info.textgrid.middleware.oaipmh.RecordType;
@Component
public class RecordDelivererIDIOM extends RecordDelivererAbstract {
- private static Log log = LogFactory.getLog(RecordDelivererIDIOM.class);
-
private String dateOfLastOblectModification;
RecordType record = new RecordType();
@@ -90,16 +86,11 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
.getRcordByIDFromElasticSearch("textgrid-nonpublic", changedId, fields, Strings.EMPTY_ARRAY)
.getSource());
- //log.debug("id in elasticsearch is: " + OAIPMHUtilities
- // .datestampAsString(OAIPMHUtilities.fieldLoader(json, TGConstants.CREATED)));
- //log.debug(json);
-
this.dateOfObjectCreation = OAIPMHUtilities
.datestampAsString(OAIPMHUtilities.fieldLoader(json, TGConstants.CREATED));
this.dateOfLastOblectModification = OAIPMHUtilities
.datestampAsString(OAIPMHUtilities.fieldLoader(json, TGConstants.MODIFIED_FIELD));
- // objectInDatabase.getField(TGConstants.MODIFIED_FIELD).getValue().toString();
}
/**
@@ -120,8 +111,6 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
textgridBaseURI_FromID = id;
}
- log.debug("ID for generating the METS/MODS file is: " + textgridBaseURI_FromID);
-
this.metsmods = new ClassicMayanMetsMods(
textgridBaseURI_FromID,
this.dateOfObjectCreation,
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java
index 8f42c131d8dcc4f1da536e231c137667db8bfbb1..794bb4f4174c8c1eec9c42ac9b9a11456b842db4 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java
@@ -81,11 +81,6 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
// DARIAH
// **
- // else if (this.dariah) {
- // Nothing to remove for DARIAH IDs here.
- // }
-
- log.debug("uri: " + uri + " | eventuallyChangedUri: " + eventuallyChangedUri);
try {
@@ -118,10 +113,6 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
List<String> result = new ArrayList<String>();
QueryBuilder query;
-
- log.debug("rangefield: " + this.dateOfObjectCreation);
- log.debug("set: " + set);
-
QueryBuilder rangeQuery = QueryBuilders.rangeQuery(this.dateOfObjectCreation).from(from).to(to);
QueryBuilder tgFilterSandBox = QueryBuilders.matchPhraseQuery("nearlyPublished", "true");
@@ -163,13 +154,8 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
query = QueryBuilders.boolQuery().must(rangeQuery);
}
}
-
- log.debug("query:\n" + query);
-
result = getFieldsFromESIndex(query, resumptionToken, set);
- log.debug("URI list result: " + result);
-
return result;
}
@@ -259,16 +245,10 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
}
- log.debug("cursorCollector: " + cursorCollector);
-
} else {
setFoundItems(false);
}
- if (this.resTokenForResponse != null) {
- log.debug("restok value: " + this.resTokenForResponse.getValue());
- log.debug("restok cursor: " + this.resTokenForResponse.getCursor());
- }
return uriList;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
index e56bbde9546c09869e95d0aea66a471d1befd09c..9c59011fbb1be72e093b358a6e4525561e8cbdb8 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -7,8 +7,6 @@ import java.text.ParseException;
import java.util.Hashtable;
import java.util.Map;
import javax.xml.datatype.DatatypeConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.search.SearchRequest;
@@ -45,7 +43,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
// STATICS
// **
- private static Log log = LogFactory.getLog(RecordListDelivererDC.class);
protected static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
// **
@@ -136,9 +133,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
QueryBuilder recordFilter;
DublinCoreBuilder dublinCoreBuilder = new DublinCoreBuilder();
- log.debug("formatField: " + (this.formatField == null ? "NULL" : this.formatField));
- log.debug("formatToFilter: " + (this.formatToFilter == null ? "NULL" : this.formatToFilter));
-
if (this.dariah == true) {
// All objects!
recordFilter = query;
@@ -178,9 +172,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
}
}
- log.debug("Queried fields: " + this.fields.toString());
- log.debug("Lifetime for resumption token is set to: " + LIFETIME_RES_TOKEN);
-
scrollID = scrollResp.getScrollId();
long completeListSize = scrollResp.getHits().totalHits;
@@ -220,14 +211,8 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
dublinCoreBuilder = putContentIntoDCFieldListsTG(hit,
furtherDCElements(workUri, OAI_ESClient.getEsClient()));
- log.debug(
- "ID field: " + (this.identifierField == null ? "NULL" : this.identifierField));
-
String identifier = hit.getSourceAsMap().get(this.identifierField).toString();
- log.debug("identifier (tgrep): " + identifier);
- log.debug("setSpec: " + setSpec);
-
HeaderType header = OAIPMHUtilities.computeTheF______Header(
OAIPMHUtilities.convertDateFormat(this.modifiedValue).toString(), identifier,
setSpec);
@@ -253,9 +238,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
String identifier = OAIPMHUtilities.fieldLoader(json, this.identifierField);
String setSpec = OAIPMHUtilities.getSetSpec(set, this.specFieldPrefix, identifier);
- log.debug("identifier (dhrep): " + identifier);
- log.debug("setSpec: " + set);
-
try {
dublinCoreBuilder = putContentIntoDCFieldListsDH(hit);
@@ -280,8 +262,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
recordList.setResumptionToken(resTokenForResponse);
- log.debug("RESTOK: " + recordList.getResumptionToken());
-
} else {
setFoundItems(false);
}
@@ -296,9 +276,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
public ListRecordsType getRecords(String from, String to, String set, String resumptionToken)
throws ParseException, IOException {
- log.debug("Started List Records with booleans for DARIAH: " + this.dariah + " and TextGrid: "
- + this.textgrid);
-
ListRecordsType recordList = new ListRecordsType();
QueryBuilder query;
QueryBuilder rangeQuery = QueryBuilders.rangeQuery(this.rangeField).from(from).to(to);
@@ -340,11 +317,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
try {
- log.debug("getRecords(): " + (query != null ? "queryName=" + query.getName() : "query=NULL")
- + " | " + (recordList != null ? recordList : "recordList=NULL") + " | "
- + (resumptionToken != null ? resumptionToken : "resumptionToken=NULL") + " | "
- + (set != null ? set : "set=NULL"));
-
fetchFields(query, recordList, resumptionToken, set);
// FOR DHREP ONLY: Add record with set metadata in it (to also find collection metadata in
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
index c854bffa585da4ffb03e31fffc2455331fbbc94d..851f5494af15fc7c341361ecb1f4f21bea9da611 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -4,8 +4,6 @@ import java.io.IOException;
import java.text.ParseException;
import java.util.Hashtable;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchScrollRequest;
@@ -31,8 +29,6 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
// **
// STATICS
// **
-
- private static Log log = LogFactory.getLog(RecordListDelivererIDIOM.class);
protected static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
// Set default to 30, can be changed in oaipmh.properties.
@@ -78,9 +74,6 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
searchSourceBuilder.size(this.idiomResponseSize);
searchRequest.source(searchSourceBuilder);
- log.debug("resToken: " + resumptionToken);
- log.debug("from=" + from + ", until=" + to);
-
if (resumptionToken != null) {
SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
scrollRequest.scroll(TimeValue.timeValueHours(24L));
@@ -105,13 +98,9 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
long completeListSize = scrollResp.getHits().totalHits;
- log.debug("completeListSize: " + completeListSize);
-
if (completeListSize > 0) {
setFoundItems(true);
- log.debug("found items: " + isFoundItems());
-
int i = 0;
for (SearchHit hit : scrollResp.getHits().getHits()) {
@@ -120,14 +109,6 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
String textgridURI =
OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), "textgridUri");
- // log.debug("IDIOM URIs: " + textgridURI);
-
- // hit.getFields().get("textgridUri").getValue().toString().replace(".0", "");
-
- // log.debug("Processing: " + textgridURI);
-
- log.debug(i + " Records are processed");
-
RecordDelivererIDIOM idiomRecord = new RecordDelivererIDIOM(true, false);
recordList.getRecord()
.add(idiomRecord.getRecordById(textgridURI.replace(".0", "")).getRecord());
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
index f7c12dbaf8bcd1d8e5356c418d0f1616d54ebb2b..0567e0729f208acd8447d2dbb27a3f657bd77cc8 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
@@ -112,15 +112,11 @@ public class SetListDeliverer {
request.source(searchSourceBuilder);
- log.debug("request: " + request);
-
// Get items with TG or DH request.
SearchResponse getRecordListItems = null;
try {
getRecordListItems = OAI_ESClient.getEsClient().search(request, RequestOptions.DEFAULT);
- log.debug("list item count: " + getRecordListItems.getHits().totalHits);
-
} catch (IOException e) {
// TODO Auto-generated catch block
log.error(e.getMessage());
@@ -158,8 +154,6 @@ public class SetListDeliverer {
String name = entry.getKey();
- log.debug("entry key: " + entry.getKey());
-
if (name.equals(DH_COLLECTION_FILTER_NAME)) {
Filter filterCollection =
getRecordListItems.getAggregations().get(DH_COLLECTION_FILTER_NAME);
@@ -169,18 +163,12 @@ public class SetListDeliverer {
// Divide ID and title.
String combined = b.getKeyAsString();
- log.debug("combined: " + combined);
-
int indexOf = combined.indexOf(DH_FIELD_DIVIDER);
// ID already contains the setSpecPrefix!
String id = combined.substring(0, indexOf);
- log.debug("id: " + id);
-
String title = combined.substring(indexOf + 1);
- log.debug("title: " + title);
-
// Set set.
SetType newSet = new SetType();
newSet.setSetSpec(id);