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 d0bcf0230c066c514b1da78bea50b74646ea98cb..e9bcf802b14c6d807a009c26c1d76187840e3279 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java @@ -87,7 +87,7 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD 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(":"); @@ -100,11 +100,11 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD } QueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(queryField, valueField); - QueryBuilder boolQuery = QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery); + QueryBuilder boolQuery = QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery).mustNot(filterSandBox); query = boolQuery; }else { - query = rangeQuery; + query = QueryBuilders.boolQuery().must(rangeQuery).mustNot(filterSandBox); } return getConentFromESIndex(query, resumptionToken, set); diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java index 6190d550a6b35fb1920f1690c4ddd10561e9561a..41c047dde1b9c192e2737c64caf29ce12d4c70d7 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java @@ -59,6 +59,8 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer //System.out.println("RANGEFIELD: " + "created"); QueryBuilder rangeQuery = QueryBuilders.rangeQuery("created").from(from).to(to); + QueryBuilder filterSandBox = QueryBuilders.matchPhraseQuery("nearlyPublished", "true"); + if(set!=null && !set.equals("openaire_data")) { String[] setParts = set.split(":"); @@ -71,11 +73,12 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer } QueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(queryField, valueField); - QueryBuilder boolQuery = QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery); + QueryBuilder boolQuery = QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery).mustNot(filterSandBox); query = boolQuery; }else { - query = rangeQuery; + //query = rangeQuery; + query = QueryBuilders.boolQuery().must(rangeQuery).mustNot(filterSandBox); } return getFieldsFromESIndex(query, resumptionToken, set);