Exclude NOR051 (SGSV) from DUPLSITE stats

TODOs for AccessionDetails, Taxonomy, ExplorerController#overview

src/main/java/org/genesys2/server/model/elastic/AccessionDetails.java

@@ -46,6 +46,8 @@ public class AccessionDetails {
 	private Boolean available;
 	private Date createdDate;
 	// FIXME @Field(index = FieldIndex.not_analyzed, type = FieldType.String)
+	// TODO Also handle ElasticsearchSearchServiceImpl and move to #isAnalyzed()
+	// section!
 	private List<String> duplSite;
 	private Boolean mlsStatus;
 	private Boolean art15;
@@ -61,6 +63,8 @@ public class AccessionDetails {
 	@Field(type = FieldType.Nested)
 	private ArrayList<Alias> aliases;
 	private Svalbard sgsv;
+	// FIXME TODO Enable inSgsv!
+	// private boolean inSgsv;
 	@Field(type = FieldType.Nested, store = false)
 	private ArrayList<Remark> remarks;
 
@@ -120,6 +124,8 @@ public class AccessionDetails {
 
 	public void svalbard(SvalbardData svalbardData) {
 		this.sgsv = Svalbard.from(svalbardData);
+		// FIXME TODO inSgsv
+		// this.inSgsv = this.sgsv != null;
 	}
 
 	public void remarks(List<AccessionRemark> listAccessionRemarks) {
@@ -387,4 +393,12 @@ public class AccessionDetails {
 	public void setArt15(Boolean art15) {
 		this.art15 = art15;
 	}
+
+	// TODO FIXME enable #inSgsv
+	// public boolean isInSgsv() {
+	// return inSgsv;
+	// }
+	// public void setInSgsv(boolean inSgsv) {
+	// this.inSgsv = inSgsv;
+	// }
 }

src/main/java/org/genesys2/server/model/elastic/Taxonomy.java

@@ -13,6 +13,9 @@ public class Taxonomy {
 	private String genus;
 	@Field(index = FieldIndex.not_analyzed, type = FieldType.String)
 	private String species;
+	// TODO FIXME Enable non-indexed access to genus+species
+	// @Field(index = FieldIndex.not_analyzed, type = FieldType.String)
+	// private String genusSpecies;
 	private String spAuthor;
 	private String subtax;
 	private String subtAuthor;

src/main/java/org/genesys2/server/service/impl/ElasticsearchSearchServiceImpl.java

@@ -116,7 +116,12 @@ public class ElasticsearchSearchServiceImpl implements ElasticService, Initializ
 
 		AndFilterBuilder filterBuilder = getFilterBuilder(appliedFilters);
 
-		FacetRequest termFacetRequest = new TermFacetRequestBuilder("f").applyQueryFilter().fields(term).size(size).build();
+		FacetRequest termFacetRequest;
+		if (FilterConstants.DUPLSITE.equals(term)) {
+			termFacetRequest = new TermFacetRequestBuilder("f").applyQueryFilter().fields(term).excludeTerms("nor051").size(size).build();
+		} else {
+			termFacetRequest = new TermFacetRequestBuilder("f").applyQueryFilter().fields(term).size(size).build();
+		}
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withFilter(filterBuilder).withFacet(termFacetRequest).build();
 
 		try {

src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java

@@ -482,6 +482,7 @@ public class ExplorerController extends BaseController {
 	private void overviewManagement(ModelMap model, AppliedFilters appliedFilters) throws SearchException {
 		model.addAttribute("statsStorage", elasticService.termStatisticsAuto(appliedFilters, FilterConstants.STORAGE, 30));
 		model.addAttribute("statsDuplSite", elasticService.termStatisticsAuto(appliedFilters, FilterConstants.DUPLSITE, 10));
+		model.addAttribute("statsSGSV", elasticService.termStatistics(appliedFilters, FilterConstants.SGSV, 2));
 	}
 
 	private void overviewComposition(ModelMap model, AppliedFilters appliedFilters) throws SearchException {

src/main/webapp/WEB-INF/jsp/accession/overview.jsp

@@ -194,6 +194,16 @@
 			<c:remove var="termResult" />
 			<c:remove var="type" />
 		</div>
+		<%-- TODO FIXME enable #inSgsv 
+		<div class="col-xs-12 col-sm-6 row-section">
+			<h4 id="stats-duplsite"><spring:message code="filter.sgsv" /></h4>
+			<c:set var="type" value="bool" />
+			<c:set var="termResult" value="${statsSGSV}" />
+				<%@include file="termresult.jspf"%>
+			<c:remove var="termResult" />
+			<c:remove var="type" />
+		</div>
+		--%>
 	</div>