Skip to content
Snippets Groups Projects
Commit 861b77d9 authored by mbrodhu's avatar mbrodhu
Browse files

No sandboxed projects

parent e40955a6
No related branches found
No related tags found
No related merge requests found
......@@ -107,6 +107,13 @@
<artifactId>package-info-maven-plugin</artifactId>
<version>1.4.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.json/json -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20190722</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
......
......@@ -9,22 +9,29 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import org.elasticsearch.search.aggregations.bucket.filter.Filter;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.script.Script;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.aggregations.Aggregation;
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.Aggregations;
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
import org.json.JSONObject;
import info.textgrid.clients.tgauth.AuthClientException;
import info.textgrid.middleware.oaipmh.ListSetsType;
......@@ -84,7 +91,9 @@ public class SetDeliverer {
projectNameAndID = AggregationBuilders.terms("projects")
.script(mergeProjectIDandProjectName)
.size(1000);
.size(1000);
filterPublicProjects.subAggregation(projectNameAndID);
}
if (this.dariah){
......@@ -100,10 +109,10 @@ public class SetDeliverer {
searchSourceBuilder.size(0);
searchSourceBuilder.aggregation(filterPublicProjects);
searchSourceBuilder.aggregation(projectNameAndID);
//searchSourceBuilder.aggregation(projectNameAndID);
request.source(searchSourceBuilder);
System.out.println(request);
SearchResponse getRecordListItems = null;
try {
......@@ -118,19 +127,33 @@ public class SetDeliverer {
String projectName="";
for (Entry<String, Aggregation> entry : getRecordListItems.getAggregations().asMap().entrySet()) {
String name = entry.getKey();
String name = entry.getKey();
if (name.equals("projects")) {
if (name.equals("projectsPublic")) {
Filter trytry = getRecordListItems.getAggregations().get("projectsPublic");
Terms trytry2 = trytry.getAggregations().get("projects");
for(Bucket bentry : trytry2.getBuckets()) {
projectName = bentry.getKey().toString();
String [] projectInfos = projectName.split("&");
SetType setsForTextGrid = new SetType();
setsForTextGrid.setSetSpec(projectInfos[0]);
setsForTextGrid.setSetName(projectInfos[1]);
setList.getSet().add(setsForTextGrid);
}
/* System.out.println(trytry.getAggregations().get("projects"));
Terms a = (Terms) entry.getValue();
System.out.println("TERM: " + a.getName());
for (Bucket bentry : a.getBuckets()) {
projectName = bentry.getKey().toString();
String [] projectInfos = projectName.split("&");
SetType setForsTextGrid = new SetType();
setForsTextGrid.setSetSpec(projectInfos[0]);
setForsTextGrid.setSetName(projectInfos[1]);
setList.getSet().add(setForsTextGrid);
}
} */
}
}
......
......@@ -444,7 +444,7 @@ public class OaiPmhTest {
* @throws ParseException
*/
@Test
@Ignore
//@Ignore
public void testListSetsTG() throws ParseException {
OaiPmhTest.setListTextGrid.setFormatField("format");
OaiPmhTest.setListTextGrid.setFormatToFilter(TextGridMimetypes.EDITION);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment