diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 6f638a287fed46623fc95487938d16deb4728269..2cd00751431ece9d7d5c8417e1d7d981ade99e84 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.1-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
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 3254d1ae3d1169bde115dcc8f1ea489016990cd2..3e07a5bcf91e4306e650a7938e924496c26f8e94 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
@@ -94,8 +94,40 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setDate(GetResponse responseWorkValues, String[] fields) {
+<<<<<<< HEAD
// TODO: transform to OAI-PMH certificated time stamp
return fillList(responseWorkValues, fields);
+=======
+
+ List<String> dates = new ArrayList<String>();
+
+ if (responseWorkValues.isExists()) {
+ for (String field : fields) {
+ try {
+ // FIXME DO SET VALUES VIA CONFIG FILE!
+ if (responseWorkValues.getField(field) != null) {
+ dates.add(OAIPMHUtilities
+ .convertDateFormat(responseWorkValues.getField(field).getValue().toString())
+ .toXMLFormat());
+ }
+ } 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) {
+ // FIXME DO NOT USE INVALID DATE HERE!
+ dates.add(responseWorkValues.getField(field).getValue().toString());
+ log.debug("Tried to configure date value: "
+ + responseWorkValues.getField(field).getValue().toString());
+ log.debug(e);
+ }
+ }
+ }
+
+ return dates;
+>>>>>>> develop
}
/**
@@ -113,8 +145,9 @@ public class DublinCoreFieldLoader {
for (String field : fields) {
if (hit.getFields().get(field) != null) {
try {
- dates.add(OAIPMHUtillities.convertDateFormat(
- hit.getFields().get(field).getValues().get(0).toString()).toXMLFormat());
+ dates.add(OAIPMHUtilities
+ .convertDateFormat(hit.getFields().get(field).getValues().get(0).toString())
+ .toXMLFormat());
} catch (ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
index 8da344ed303068ca3a5c0ae8be70e4418b537e28..2188fc2829068bdac6f24de2dba286bd119a63eb 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
@@ -163,7 +163,7 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
// hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
String datestamp = hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
try {
- datestamp = OAIPMHUtillities.convertDateFormat(datestamp).toXMLFormat();
+ datestamp = OAIPMHUtilities.convertDateFormat(datestamp).toXMLFormat();
} catch (ParseException e1) {
log.debug(e1);
} catch (DatatypeConfigurationException e1) {
@@ -180,7 +180,7 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
try {
this.datestamp = hit.getFields().get(this.dateOfObjectCreation).getValue().toString();
- this.datestamp = OAIPMHUtillities.convertDateFormat(this.datestamp).toXMLFormat();
+ this.datestamp = OAIPMHUtilities.convertDateFormat(this.datestamp).toXMLFormat();
} catch (ParseException e1) {
log.debug(e1);
} catch (DatatypeConfigurationException e1) {
@@ -193,7 +193,7 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
}
// Check the need for a resumption token!
- ResumptionTokenType resTokenForResponse = OAIPMHUtillities.getResumptionToken(
+ ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(
listFurtherValues.getHits().getTotalHits(), resumptionToken, cursorCollector,
listFurtherValues.getScrollId(), this.searchResponseSize, i);
if (resTokenForResponse != null) {
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 d9b56b130a4c3a87da9d1aff692770071bfca300..d6366a3337289940626552e100262b2dda2b1cce 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
@@ -59,7 +59,7 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
}
// Check the need for a resumption token!
- ResumptionTokenType resTokenForResponse = OAIPMHUtillities.getResumptionToken(listSize,
+ ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(listSize,
resumptionToken, cursorCollector, resTokenValue, 30, i);
if (resTokenForResponse != null) {
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
index 1930ba0cb659c63dbd2949d4aab6842b3f905b13..e863d9bbdef4d97803c57659db3a37583053bd40 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
@@ -11,7 +11,7 @@ import info.textgrid.middleware.oaipmh.MetadataFormatType;
import info.textgrid.middleware.oaipmh.RequestType;
/**
- *
+ *
*/
public class MetadataFormatListDeliverer {
@@ -55,9 +55,9 @@ public class MetadataFormatListDeliverer {
if (tgObject.isExists()) {
setIdExist(true);
- mft.setMetadataNamespace("http://www.openarchives.org/OAI/2.0/oai_dc/");
mft.setMetadataPrefix(TGConstants.METADATA_DC_PREFIX);
- mft.setSchema("https://www.openarchives.org/OAI/2.0/oai_dc.xsd");
+ mft.setMetadataNamespace(OAIPMHUtilities.OAIDC_NAMESPACE);
+ mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
lmft.getMetadataFormat().add(mft);
} else {
setIdExist(false);
@@ -76,14 +76,14 @@ public class MetadataFormatListDeliverer {
MetadataFormatType mft = new MetadataFormatType();
MetadataFormatType mftIdiomMets = new MetadataFormatType();
- mft.setMetadataNamespace("http://www.openarchives.org/OAI/2.0/oai_dc/");
mft.setMetadataPrefix(TGConstants.METADATA_DC_PREFIX);
- mft.setSchema("https://www.openarchives.org/OAI/2.0/oai_dc.xsd");
+ mft.setMetadataNamespace(OAIPMHUtilities.OAIDC_NAMESPACE);
+ mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
lmft.getMetadataFormat().add(mft);
- mftIdiomMets.setMetadataNamespace("http://www.loc.gov/METS/");
mftIdiomMets.setMetadataPrefix(TGConstants.METADATA_IDIOM_PREFIX);
- mftIdiomMets.setSchema("https://www.loc.gov/standards/mets/mets.xsd");
+ mftIdiomMets.setMetadataNamespace(OAIPMHUtilities.METS_NAMESPACE);
+ mftIdiomMets.setSchema(OAIPMHUtilities.METS_SCHEMA_LOCATION);
lmft.getMetadataFormat().add(mftIdiomMets);
return lmft;
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 fb74d235e1d9e65d8fb0977235884375f9be2bbc..9bd92f915169f959e1f923f3842671d7bd477842 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -32,22 +32,11 @@ import info.textgrid.middleware.oaipmh.VerbType;
*
* @author Maximilian Brodhun, SUB Göttingen
* @author Stefan E. Funk, SUB Göttingen
- * @version 2019-10-28
+ * @version 2019-10-29
* @since 2014-01-29
*/
public class OAIPMHImpl implements OAIPMHProducer {
- // **
- // FINALS
- // **
-
- private static final String OAIPMH_SCHEMA_LOCATION =
- "http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd";
- private static final String OAIDC_SCHEMA_LOCATION =
- "http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd";
- private static final String DC_SCHEMA_LOCATION =
- "http://purl.org/dc/elements/1.1/ https://dublincore.org/schemas/xmls/simpledc20021212.xsd";
-
// **
// STATICS
// **
@@ -622,8 +611,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
// Set the responseDate of today.
try {
XMLGregorianCalendar convertedDateFormat;
- convertedDateFormat = OAIPMHUtillities
- .convertDateFormat(OAIPMHUtillities.getXMLGregorianCalendarNow().toString());
+ convertedDateFormat = OAIPMHUtilities
+ .convertDateFormat(OAIPMHUtilities.getXMLGregorianCalendarNow().toString());
response.setResponseDate(convertedDateFormat);
} catch (ParseException e) {
this.log.debug("can not parse date format");
@@ -688,10 +677,13 @@ public class OAIPMHImpl implements OAIPMHProducer {
String result = "";
// Always add OAIPMH schema location.
- String schemaLocations = OAIPMH_SCHEMA_LOCATION;
+ String schemaLocations =
+ OAIPMHUtilities.OAIPMH_NAMESPACE + " " + OAIPMHUtilities.OAIPMH_SCHEMA_LOCATION;
// Add OAI_DC and DC schema location if needed.
if (theVerb.equals("GetRecord") || theVerb.endsWith("ListRecords")) {
- schemaLocations += OAIDC_SCHEMA_LOCATION + " " + DC_SCHEMA_LOCATION;
+ schemaLocations +=
+ OAIPMHUtilities.OAIDC_NAMESPACE + " " + OAIPMHUtilities.OAIDC_SCHEMA_LOCATION;
+ schemaLocations += OAIPMHUtilities.DC_NAMESPACE + " " + OAIPMHUtilities.DC_SCHEMA_LOCATION;
}
// PLEASE NOTE We always get oai_dc and dc prefixes defined in the root element due to the
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtillities.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
similarity index 85%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtillities.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
index 3fb618339e11c2d6a310704680367f0ed3209985..1457e8932cfedd5fae9c8c5a729c4c1c8c02e811 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtillities.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
@@ -18,24 +18,41 @@ import info.textgrid.middleware.oaipmh.ResumptionTokenType;
/**
* <p>
* OAIPMHUtillities is responsible to implement all necessary functions to implement the arguments
- * of a request
+ * of a request.
* </p>
*
- * @author Maximilian Brodhun: SUB
- * @version 1.0
- * @since 29.01.2014
- *
+ * @author Maximilian Brodhun, SUB Göttingen
+ * @version 2019-10-29
+ * @since 2014-01-29
*/
+public class OAIPMHUtilities {
+
+ // **
+ // FINALS
+ // **
+
+ public static final String OAIPMH_NAMESPACE = "http://www.openarchives.org/OAI/2.0/";
+ public static final String OAIPMH_SCHEMA_LOCATION =
+ "http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd";
+ public static final String OAIDC_NAMESPACE = "http://www.openarchives.org/OAI/2.0/oai_dc/";
+ public static final String OAIDC_SCHEMA_LOCATION =
+ "http://www.openarchives.org/OAI/2.0/oai_dc.xsd";
+ public static final String DC_NAMESPACE = "http://purl.org/dc/elements/1.1/";
+ public static final String DC_SCHEMA_LOCATION =
+ "https://dublincore.org/schemas/xmls/simpledc20021212.xsd";
+ public static final String METS_NAMESPACE = "http://www.loc.gov/METS/";
+ public static final String METS_SCHEMA_LOCATION = "http://www.loc.gov/standards/mets/mets.xsd";
+
+ // **
+ // STATICS
+ // **
-public class OAIPMHUtillities {
-
- /**
- *
- */
private static org.apache.commons.logging.Log log = LogFactory.getLog(OAIPMHImpl.class);
/**
- * Since textGrid just supports dc the only returned MetadataFormat is dublinCore
+ * <p>
+ * Since TextGrid just supports DC the only returned MetadataFormat is DublinCore.
+ * </p>
*
* @return
*/
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
index fe7de636b5b2a54caff0ff4262357671434c322b..7e9e12314fe3823e595d9f1dbcceef6ee7aacf46 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
@@ -114,7 +114,7 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
if (esResultObject.getField(this.dateOfObjectCreation) != null) {
try {
- dateOfCreation = OAIPMHUtillities
+ dateOfCreation = OAIPMHUtilities
.convertDateFormat(
esResultObject.getField(this.dateOfObjectCreation).getValue().toString())
.toXMLFormat();
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 7804bc97b9b93b9fe6105d033224d14a07d7e88d..a46f31f0c988a7160361de2a45c6cce82c5be38f 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
@@ -167,7 +167,7 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
HeaderType recordHeader = new HeaderType();
recordHeader.setIdentifier(identifier);
- recordHeader.setDatestamp(OAIPMHUtillities.datestampAsString(dateOfCreation));
+ recordHeader.setDatestamp(OAIPMHUtilities.datestampAsString(dateOfCreation));
this.record.setHeader(recordHeader);
// return recordHeader;
}
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 488b04420be440536085c3d8fe375a4c59cbffe5..2859bf73809ace455e358d04b8de0b0cc2f0cc81 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -6,9 +6,7 @@ import java.net.URLDecoder;
import java.text.ParseException;
import java.util.Hashtable;
import java.util.Map;
-
import javax.xml.datatype.DatatypeConfigurationException;
-
import org.apache.commons.logging.LogFactory;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse;
@@ -24,7 +22,6 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
-
import info.textgrid.middleware.oaipmh.HeaderType;
import info.textgrid.middleware.oaipmh.ListRecordsType;
import info.textgrid.middleware.oaipmh.MetadataType;
@@ -82,7 +79,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
private String modifiedValue;
private static final int lifeTimeResToken = 600;
private long resultSize;
-
+
static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
private int searchResponseSize;
@@ -113,17 +110,19 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
- String[] includes = this.workFields;
- String[] excludes = Strings.EMPTY_ARRAY;
- FetchSourceContext fetchSourceContext = new FetchSourceContext(true, includes, excludes);
- GetRequest getRequest = new GetRequest(OAI_ESClient.getEsIndex(), OAI_ESClient.getEsType(), id).fetchSourceContext(fetchSourceContext);
-
- GetResponse responseWorkValues=null;
+ String[] includes = this.workFields;
+ String[] excludes = Strings.EMPTY_ARRAY;
+ FetchSourceContext fetchSourceContext = new FetchSourceContext(true, includes, excludes);
+ GetRequest getRequest =
+ new GetRequest(OAI_ESClient.getEsIndex(), OAI_ESClient.getEsType(), id)
+ .fetchSourceContext(fetchSourceContext);
+
+ GetResponse responseWorkValues = null;
try {
- responseWorkValues = OAI_ESClient.getEsClient().get(getRequest, RequestOptions.DEFAULT);
+ responseWorkValues = OAI_ESClient.getEsClient().get(getRequest, RequestOptions.DEFAULT);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
return responseWorkValues;
@@ -150,7 +149,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
SearchResponse scrollResp;
QueryBuilder recordFilter;
DublinCoreBuilder dublinCoreBuilder = new DublinCoreBuilder();
-
+
if (this.dariah == true) {
recordFilter = query;
} else {
@@ -160,34 +159,34 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
SearchRequest searchRequest = new SearchRequest(OAI_ESClient.getEsIndex());
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-
- scrollResp=null;
+
+ scrollResp = null;
searchSourceBuilder.query(recordFilter);
- searchSourceBuilder.size(this.searchResponseSize);
+ searchSourceBuilder.size(this.searchResponseSize);
searchRequest.source(searchSourceBuilder);
if (resumptionToken != null) {
- SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
- scrollRequest.scroll(TimeValue.timeValueSeconds(lifeTimeResToken));
-
- try {
- scrollResp = OAI_ESClient.getEsClient().scroll(scrollRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
+ scrollRequest.scroll(TimeValue.timeValueSeconds(lifeTimeResToken));
+
+ try {
+ scrollResp = OAI_ESClient.getEsClient().scroll(scrollRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
} else {
-
- searchRequest.source(searchSourceBuilder);
- searchRequest.scroll(TimeValue.timeValueMinutes(lifeTimeResToken));
- try {
- scrollResp = OAI_ESClient.getEsClient().search(searchRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+
+ searchRequest.source(searchSourceBuilder);
+ searchRequest.scroll(TimeValue.timeValueMinutes(lifeTimeResToken));
+ try {
+ scrollResp = OAI_ESClient.getEsClient().search(searchRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
log.info("Queried fields: " + this.fields.toString());
@@ -205,19 +204,17 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
for (SearchHit hit : scrollResp.getHits().getHits()) {
i++;
-
+
if (hit != null && hit.getFields() != null) {
try {
if (hit.getSourceAsMap().get(this.dateOfObjectCreation) != null) {
- String datestamp =
- hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
- datestamp = OAIPMHUtillities.convertDateFormat(datestamp).toXMLFormat();
-
+ String datestamp = hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
+ datestamp = OAIPMHUtilities.convertDateFormat(datestamp).toXMLFormat();
}
- } catch (ParseException e1) {
- log.debug(e1);
- } catch (DatatypeConfigurationException e1) {
- log.debug(e1);
+ } catch (ParseException ee) {
+ log.debug(ee);
+ } catch (DatatypeConfigurationException e) {
+ log.debug(e);
}
this.modifiedValue = hit.getSourceAsMap().get(this.modifiedField).toString();
@@ -228,8 +225,9 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
if (this.textgrid == true && hit.getSourceAsMap().get(this.formatField)
.toString().equals(this.formatToFilter)) {
- if (DublinCoreFieldLoader.fillList(hit, blaFields).get(0)!=null) {
- workUri = DublinCoreFieldLoader.fillList(hit, blaFields).get(0).substring(this.repositoryObjectURIPrefix.length());
+ if (DublinCoreFieldLoader.fillList(hit, blaFields).get(0) != null) {
+ workUri = DublinCoreFieldLoader.fillList(hit, blaFields).get(0)
+ .substring(this.repositoryObjectURIPrefix.length());
if (!workUri.endsWith(".0")) {
workUri = workUri.concat(".0");
@@ -238,8 +236,8 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
dublinCoreBuilder = putContentIntoDCFieldLists(hit,
furtherDCElements(workUri, OAI_ESClient.getEsClient()));
- buildRecord(recordList, set,
- hit.getSourceAsMap().get(this.identifierField).toString(), dublinCoreBuilder);
+ buildRecord(recordList, set, hit.getSourceAsMap().get(this.identifierField).toString(),
+ dublinCoreBuilder);
}
if (this.dariah == true) {
@@ -252,7 +250,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
}
// Check the need for a resumption token!
- ResumptionTokenType resTokenForResponse = OAIPMHUtillities.getResumptionToken(
+ ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(
completeListSize, resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
if (resTokenForResponse != null) {
recordList.setResumptionToken(resTokenForResponse);
@@ -268,10 +266,12 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
* @param responseWorkValues
* @return
*/
- public DublinCoreBuilder putContentIntoDCFieldLists(SearchHit hit, GetResponse responseWorkValues) {
+ public DublinCoreBuilder putContentIntoDCFieldLists(SearchHit hit,
+ GetResponse responseWorkValues) {
DublinCoreBuilder result = new DublinCoreBuilder();
- result.setContributor(DublinCoreFieldLoader.setContributor(responseWorkValues, this.contributorList));
+ result.setContributor(
+ DublinCoreFieldLoader.setContributor(responseWorkValues, this.contributorList));
result.setCoverage(DublinCoreFieldLoader.setCoverage(responseWorkValues, this.coverageList));
result.setCreator(DublinCoreFieldLoader.setCreator(responseWorkValues, this.creatorList));
result.setDate(DublinCoreFieldLoader.setDate(responseWorkValues, this.dateList));
@@ -404,7 +404,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
// Set date in XML format.
try {
- header.setDatestamp(OAIPMHUtillities.convertDateFormat(this.modifiedValue).toXMLFormat());
+ header.setDatestamp(OAIPMHUtilities.convertDateFormat(this.modifiedValue).toXMLFormat());
} catch (ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -719,12 +719,12 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
this.oaiEsClient = oaiEsClient;
}
- public long getResultSize() {
- return this.resultSize;
- }
-
- public void setResultSize(long resultSize) {
- this.resultSize = resultSize;
- }
+ public long getResultSize() {
+ return this.resultSize;
+ }
+
+ public void setResultSize(long resultSize) {
+ this.resultSize = resultSize;
+ }
}
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 4eacaf08c7cb0c0444db87991807a9180fefc5e7..3f9453d92d9ee281432fe4e5de0ba99e6a7e90aa 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -85,7 +85,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
}
// Check the need for a resumption token!
- ResumptionTokenType resTokenForResponse = OAIPMHUtillities.getResumptionToken(listSize,
+ ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(listSize,
resumptionToken, cursorCollector, resTokenValue, 30, i);
if (resTokenForResponse != null) {
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java b/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java
index 919ebcd4f7477823f83dd59588dc30399311884f..50a57cf9d37fbe3eadbd3781c7d04a7fe53d2ef4 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java
@@ -22,7 +22,7 @@ public final class TGConstants {
Arrays.asList("textgrid-support@gwdg.de");
/*
- * Rep Identification String Constants
+ * Repository Identification String Constants
*/
public static final String TG_REP_BASEURL = "www.textgridrep.de";
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 b5c91e93b7e3dfb9b074a808a3189fdc94863415..a87a32185224f6b7bad7ba3cf85561d7d4e2acf0 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -93,7 +93,7 @@ public class OaiPmhTest {
@Ignore
public void testDateNow() throws DatatypeConfigurationException {
System.out.println("---------------Test Datestamp Parsing with now date -----------------");
- XMLGregorianCalendar nowTest = OAIPMHUtillities.getXMLGregorianCalendarNow();
+ XMLGregorianCalendar nowTest = OAIPMHUtilities.getXMLGregorianCalendarNow();
System.out.println(nowTest);
System.out.println("-------------------------------------------");
}
@@ -108,7 +108,7 @@ public class OaiPmhTest {
String dateformatbefore = "2012-02-06T20:48:39.614+01:00";
System.out.println("--------- Test Datestamp Parsing with a given date ---------------");
System.out.println("Original date: " + dateformatbefore);
- XMLGregorianCalendar testDate = OAIPMHUtillities.convertDateFormat(dateformatbefore);
+ XMLGregorianCalendar testDate = OAIPMHUtilities.convertDateFormat(dateformatbefore);
System.out.println("Date after conversion: " + testDate);
System.out.println("---------------------------------------------");
}
@@ -123,7 +123,7 @@ public class OaiPmhTest {
String dateformatbefore = "2012-02-06T20:48:39.614+01:00";
System.out.println("------------String Version-------------------");
System.out.println("Original date: " + dateformatbefore);
- String testDate = OAIPMHUtillities.datestampAsString(dateformatbefore);
+ String testDate = OAIPMHUtilities.datestampAsString(dateformatbefore);
System.out.println("Date after conversion: " + testDate);
System.out.println("---------------------------------------------");
}
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 86fcdedfa2d5a6419d0f2bda607a5670e2f022f1..ce53aedf75472dd6f31dab9455c9ab51f08c0136 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.1-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId>
diff --git a/pom.xml b/pom.xml
index 56ddb092c804c3749606bec0b28e9d47bf43b854..497d182017eb845256a782790f838f2f8b6716dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>DARIAHDE :: OAI-PMH DataProvider</name>
<properties>