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 99c512c49a36c0bebb2f2774f618b9523fd41232..93c8d24ffe45aba1eb0c274739383e9501cfbf34 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -1,18 +1,12 @@
package info.textgrid.middleware;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
-
-//import javax.swing.plaf.synth.SynthSpinnerUI;
-
+// import javax.swing.plaf.synth.SynthSpinnerUI;
import org.apache.commons.logging.LogFactory;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
@@ -23,11 +17,10 @@ import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
-
+import info.textgrid.middleware.common.TextGridMimetypes;
import info.textgrid.middleware.oaipmh.ListIdentifiersType;
import info.textgrid.middleware.oaipmh.RequestType;
import info.textgrid.middleware.oaipmh.ResumptionTokenType;
-import info.textgrid.middleware.common.TextGridMimetypes;
/**
*
@@ -40,12 +33,13 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
private long resultSize;
private int searchResponseSize;
public String rangeField;
-
+
protected static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
public ResumptionTokenType resTokenForResponse;
-
- private static org.apache.commons.logging.Log log = LogFactory.getLog(RecordListDelivererAbstract.class);
-
+
+ private static org.apache.commons.logging.Log log =
+ LogFactory.getLog(RecordListDelivererAbstract.class);
+
/**
* @param textgrid
* @param dariah
@@ -67,7 +61,6 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
return null;
}
-
/**
* @param from
* @param until
@@ -76,48 +69,47 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
* @return
* @throws IOException
*/
- public List<String> getUriListOfAllEditions(String from, String until, String set, String resumptionToken) throws IOException {
-
- /* InputStream input = null;
- try {
- input = new FileInputStream("/etc/dhrep/oaipmh/oaipmh.properties");
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- Properties prop = new Properties();
- prop.load(input);*/
-
- QueryBuilder query;
-
- System.out.println("FROM: " + from);
- System.out.println("TO: " + until);
-
- QueryBuilder rangeQuery = QueryBuilders.rangeQuery("created").from(from).to(until);
- QueryBuilder filterSandBox = QueryBuilders.matchPhraseQuery("nearlyPublished", "true");
- if(set!=null) {
- String[] setParts = set.split(":");
-
- String queryField = "";
- String valueField = "";
-
- if (setParts[0].equals(TGConstants.SET_FIELD_FOR_TEXTGRID)) {
- queryField = TGConstants.PROJECT_ID_FOR_TEXTGRID;
- valueField = setParts[1];
- }
- System.out.println("");
- QueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(queryField, valueField);
- QueryBuilder boolQuery = QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery).mustNot(filterSandBox);
-
- query = boolQuery;
- }else {
- query = QueryBuilders.boolQuery().must(rangeQuery).mustNot(filterSandBox);
- }
-
- return getContentFromESIndex(query, resumptionToken, set);
+ public List<String> getUriListOfAllEditions(String from, String until, String set,
+ String resumptionToken) throws IOException {
+
+ /*
+ * InputStream input = null; try { input = new
+ * FileInputStream("/etc/dhrep/oaipmh/oaipmh.properties"); } catch (FileNotFoundException e) {
+ * // TODO Auto-generated catch block e.printStackTrace(); }
+ *
+ * Properties prop = new Properties(); prop.load(input);
+ */
+
+ QueryBuilder query;
+
+ log.debug("FROM: " + from);
+ log.debug("TO: " + until);
+
+ QueryBuilder rangeQuery = QueryBuilders.rangeQuery("created").from(from).to(until);
+ QueryBuilder filterSandBox = QueryBuilders.matchPhraseQuery("nearlyPublished", "true");
+ if (set != null) {
+ String[] setParts = set.split(":");
+
+ String queryField = "";
+ String valueField = "";
+
+ if (setParts[0].equals(TGConstants.SET_FIELD_FOR_TEXTGRID)) {
+ queryField = TGConstants.PROJECT_ID_FOR_TEXTGRID;
+ valueField = setParts[1];
+ }
+ System.out.println("");
+ QueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(queryField, valueField);
+ QueryBuilder boolQuery =
+ QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery).mustNot(filterSandBox);
+
+ query = boolQuery;
+ } else {
+ query = QueryBuilders.boolQuery().must(rangeQuery).mustNot(filterSandBox);
}
-
+
+ return getContentFromESIndex(query, resumptionToken, set);
+ }
+
/**
* @param query
* @param resumptionToken
@@ -126,92 +118,88 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
* @throws IOException
*/
private List<String> getContentFromESIndex(QueryBuilder query, String resumptionToken,
- String set) throws IOException {
-
- List<String> uriList = new ArrayList<String>();
- QueryBuilder recordFilter = QueryBuilders.boolQuery().must(query)
- .must(QueryBuilders.matchPhraseQuery(TGConstants.FORMAT, TextGridMimetypes.EDITION));
-
- SearchRequest searchRequest = new SearchRequest(OAI_ESClient.getEsIndex());
- SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-
- /* InputStream input = null;
- try {
- input = new FileInputStream("/etc/dhrep/oaipmh/oaipmh.properties");
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- Properties prop = new Properties();
- prop.load(input);*/
-
- searchSourceBuilder.query(recordFilter);
- searchSourceBuilder.size(100);
- searchRequest.source(searchSourceBuilder);
-
- SearchResponse scrollResp = new SearchResponse();
-
- if (resumptionToken != null) {
- SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
- scrollRequest.scroll(TimeValue.timeValueHours(24L));
-
- 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.timeValueHours(24L));
- try {
- scrollResp = OAI_ESClient.getEsClient().search(searchRequest,RequestOptions.DEFAULT);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- String scrollID = scrollResp.getScrollId();
- long completeListSize = scrollResp.getHits().totalHits;
- setResultSize(completeListSize);
-
- if (completeListSize > 0) {
-
- setFoundItems(true);
- int i=0;
-
- for (SearchHit hit : scrollResp.getHits().getHits()) {
- i++;
- if (hit != null && hit.getFields() != null) {
- uriList.add(hit.getSourceAsMap().get(TGConstants.URI).toString());
- }
- }
-
- if(resumptionToken!=null && resTokenForResponse.getCursor().intValue()>=completeListSize) {
- try{
- cursorCollector.remove(resumptionToken);
- }catch(NullPointerException couldNotRemove) {
- log.info("Could net remove hash value: " + resumptionToken + " from hash map");
- }
- resTokenForResponse.setValue("");
- }else {
-
- resTokenForResponse = OAIPMHUtilities.getResumptionToken(
- completeListSize, resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
- }
-
- }else {
- setFoundItems(false);
- }
-
-
- return uriList;
-
+ String set) throws IOException {
+
+ List<String> uriList = new ArrayList<String>();
+ QueryBuilder recordFilter = QueryBuilders.boolQuery().must(query)
+ .must(QueryBuilders.matchPhraseQuery(TGConstants.FORMAT, TextGridMimetypes.EDITION));
+
+ SearchRequest searchRequest = new SearchRequest(OAI_ESClient.getEsIndex());
+ SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+
+ /*
+ * InputStream input = null; try { input = new
+ * FileInputStream("/etc/dhrep/oaipmh/oaipmh.properties"); } catch (FileNotFoundException e) {
+ * // TODO Auto-generated catch block e.printStackTrace(); }
+ *
+ * Properties prop = new Properties(); prop.load(input);
+ */
+
+ searchSourceBuilder.query(recordFilter);
+ searchSourceBuilder.size(100);
+ searchRequest.source(searchSourceBuilder);
+
+ SearchResponse scrollResp = new SearchResponse();
+
+ if (resumptionToken != null) {
+ SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
+ scrollRequest.scroll(TimeValue.timeValueHours(24L));
+
+ 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.timeValueHours(24L));
+ try {
+ scrollResp = OAI_ESClient.getEsClient().search(searchRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ String scrollID = scrollResp.getScrollId();
+ long completeListSize = scrollResp.getHits().totalHits;
+ setResultSize(completeListSize);
+
+ if (completeListSize > 0) {
+
+ setFoundItems(true);
+ int i = 0;
+
+ for (SearchHit hit : scrollResp.getHits().getHits()) {
+ i++;
+ if (hit != null && hit.getFields() != null) {
+ uriList.add(hit.getSourceAsMap().get(TGConstants.URI).toString());
+ }
+ }
+
+ if (resumptionToken != null
+ && this.resTokenForResponse.getCursor().intValue() >= completeListSize) {
+ try {
+ cursorCollector.remove(resumptionToken);
+ } catch (NullPointerException couldNotRemove) {
+ log.info("Could net remove hash value: " + resumptionToken + " from hash map");
+ }
+ this.resTokenForResponse.setValue("");
+ } else {
+
+ this.resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
+ resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
+ }
+
+ } else {
+ setFoundItems(false);
+ }
+
+ return uriList;
}
-
-
+
+
/**
* @param request
* @return
@@ -234,15 +222,15 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
// Check if resumptionToken is invalid or existing.
if (request.getResumptionToken() != null) {
boolean restokDCExisting = IdentifierListDelivererDC.cursorCollector != null
- && IdentifierListDelivererDC.cursorCollector.containsKey(request.getResumptionToken());
+ && IdentifierListDelivererDC.cursorCollector.containsKey(request.getResumptionToken());
boolean restokIDIOMExisting = IdentifierListDelivererIDIOM.cursorCollector != null
- && IdentifierListDelivererDC.cursorCollector.containsKey(request.getResumptionToken());
+ && IdentifierListDelivererDC.cursorCollector.containsKey(request.getResumptionToken());
boolean restok = cursorCollector != null
- && cursorCollector.containsKey(request.getResumptionToken());
-
- if (!restokDCExisting && !restokIDIOMExisting && !restok) {
-
- result.setError(TGConstants.OAI_BAD_RESUMPTION_TOKEN, "The value of the "
+ && cursorCollector.containsKey(request.getResumptionToken());
+
+ if (!restokDCExisting && !restokIDIOMExisting && !restok) {
+
+ result.setError(TGConstants.OAI_BAD_RESUMPTION_TOKEN, "The value of the "
+ request.getResumptionToken() + " argument is invalid or expired.");
}
}
@@ -263,36 +251,60 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
return result;
}
- public boolean isFoundItems() {
- return foundItems;
- }
-
- public void setFoundItems(boolean foundItems) {
- this.foundItems = foundItems;
- }
-
- public long getResultSize() {
- return resultSize;
- }
-
- public void setResultSize(long resultSize) {
- this.resultSize = resultSize;
- }
-
- public ResumptionTokenType getResTokenForResponse() {
- return resTokenForResponse;
- }
-
- public void setResTokenForResponse(ResumptionTokenType resTokenForResponse) {
- this.resTokenForResponse = resTokenForResponse;
- }
-
- public String getRangeField() {
- return rangeField;
- }
-
- public void setRangeField(String rangeField) {
- this.rangeField = rangeField;
- }
-
+ /**
+ * @return
+ */
+ public boolean isFoundItems() {
+ return this.foundItems;
+ }
+
+ /**
+ * @param foundItems
+ */
+ public void setFoundItems(boolean foundItems) {
+ this.foundItems = foundItems;
+ }
+
+ /**
+ * @return
+ */
+ public long getResultSize() {
+ return this.resultSize;
+ }
+
+ /**
+ * @param resultSize
+ */
+ public void setResultSize(long resultSize) {
+ this.resultSize = resultSize;
+ }
+
+ /**
+ * @return
+ */
+ public ResumptionTokenType getResTokenForResponse() {
+ return this.resTokenForResponse;
+ }
+
+ /**
+ * @param resTokenForResponse
+ */
+ public void setResTokenForResponse(ResumptionTokenType resTokenForResponse) {
+ this.resTokenForResponse = resTokenForResponse;
+ }
+
+ /**
+ * @return
+ */
+ public String getRangeField() {
+ return this.rangeField;
+ }
+
+ /**
+ * @param rangeField
+ */
+ public void setRangeField(String rangeField) {
+ this.rangeField = rangeField;
+ }
+
}
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 f4d96ee72b93b285370a90e1e51d93bd931a0a82..dec846d4acd1320c90edf94d15ae6541950e061e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -105,8 +105,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
this.openAireRecordList = openAireRecordList;
this.metadataFormatList = metadataFormatList;
- System.out.println(" ## MetadataFormatList Implementing Class --> "
- + metadataFormatList.getClass().getName());
+ this.log
+ .debug("MetadataFormatList Implementing Class: " + metadataFormatList.getClass().getName());
this.setList = setList;
this.identifierListDC = identifierList;
@@ -347,8 +347,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
ListIdentifiersType listIdentifiers = null;
try {
- System.out.println("GET FROM: " + request.getFrom());
- System.out.println("GET UNTIL: " + request.getUntil());
+ 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());
@@ -425,8 +425,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
public OAIPMHtype listMetadataFormatsRequest(String id, OAIPMHtype oaipmhRoot,
RequestType request) {
- System.out.println(" ## request --> " + request.getValue());
- System.out.println(" ## id --> " + id);
+ this.log.debug("request: " + request.getValue());
+ this.log.debug("id: " + id);
List<String> errorValues = new ArrayList<String>();
ListMetadataFormatsType listMF = new ListMetadataFormatsType();
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 0a0cfe692c3986b64c78740659f59799fcfe5e48..e4a8937f53c21bb6504b7a6d4b1eede4e5070024 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
@@ -284,7 +284,6 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
result.setIdentifier(
OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.identifierList));
-
result.setLanguage(DublinCoreFieldLoader.fillList(responseWorkValues, this.languageList));
result.setPublisher(DublinCoreFieldLoader.fillList(responseWorkValues, this.publisherList));
result.setRelation(