From 9462a71596f28cff10f006647bda6f8b2a19468f Mon Sep 17 00:00:00 2001
From: henrietteharmse <henrietteharmse@gmail.com>
Date: Fri, 24 Nov 2023 11:16:03 +0000
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/stable' into
 stable"

This reverts commit a6b617d9bef03c6917015722458dcfeed83f5d33, reversing
changes made to 1560000640af111f1f30dd1e90a4db2b4f05b8d1.
---
 .../controller/api/v1/V1SearchController.java |  2 +-
 .../ols/repository/solr/OlsSolrQuery.java     | 38 ++++++++++---------
 .../v2/helpers/V2SearchFieldsParser.java      |  1 +
 .../src/pages/ontologies/ontologiesSlice.ts   |  1 -
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SearchController.java b/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SearchController.java
index 1d641b071..e2cb35e64 100644
--- a/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SearchController.java
+++ b/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SearchController.java
@@ -242,7 +242,7 @@ public void search(
 
         Map<String, Object> responseBody = new HashMap<>();
         responseBody.put("numFound", qr.getResults().getNumFound());
-        responseBody.put("start", start);
+        responseBody.put("start", 0);
         responseBody.put("docs", docs);
 
         Map<String, Object> responseObj = new HashMap<>();
diff --git a/backend/src/main/java/uk/ac/ebi/spot/ols/repository/solr/OlsSolrQuery.java b/backend/src/main/java/uk/ac/ebi/spot/ols/repository/solr/OlsSolrQuery.java
index 58a895d67..b74500a84 100644
--- a/backend/src/main/java/uk/ac/ebi/spot/ols/repository/solr/OlsSolrQuery.java
+++ b/backend/src/main/java/uk/ac/ebi/spot/ols/repository/solr/OlsSolrQuery.java
@@ -68,7 +68,8 @@ public SolrQuery constructQuery() {
 				if(qf.length() > 0) {
 					qf.append(" ");
 				}
-				qf.append(ClientUtils.escapeQueryChars( getSolrPropertyName(searchField.propertyName, exactMatch ? SearchType.WHOLE_FIELD : searchField.searchType)) );
+				qf.append(ClientUtils.escapeQueryChars( getSolrPropertyName(searchField.propertyName,
+						exactMatch ? SearchType.WHOLE_FIELD : searchField.searchType)) );
 				qf.append("^");
 				qf.append(searchField.weight);
 			}
@@ -177,22 +178,25 @@ public BoostField(String propertyName, String propertyValue, int weight, SearchT
 	}
 
 	private String getSolrPropertyName(String propertyName, SearchType searchType) {
-		switch(searchType) {
-			case CASE_INSENSITIVE_TOKENS:
-				return "lowercase_" + propertyName;
-			case CASE_SENSITIVE_TOKENS:
-				return propertyName;
-			case WHOLE_FIELD:
-				return "str_" + propertyName;
-			case EDGES:
-				return "edge_" + propertyName;
-			case WHITESPACE:
-				return "whitespace_" + propertyName;
-			case WHITESPACE_EDGES:
-				return "whitespace_edge_" + propertyName;
-			default:
-				throw new RuntimeException("unknown filter accuracy");
-		}
+		if (propertyName.compareTo("_json") == 0)
+			return propertyName;
+		else
+			switch(searchType) {
+				case CASE_INSENSITIVE_TOKENS:
+					return "lowercase_" + propertyName;
+				case CASE_SENSITIVE_TOKENS:
+					return propertyName;
+				case WHOLE_FIELD:
+					return "str_" + propertyName;
+				case EDGES:
+					return "edge_" + propertyName;
+				case WHITESPACE:
+					return "whitespace_" + propertyName;
+				case WHITESPACE_EDGES:
+					return "whitespace_edge_" + propertyName;
+				default:
+					throw new RuntimeException("unknown filter accuracy");
+			}
 	}
 
 	private String getSolrPropertyValue(String propertyValue, SearchType searchType) {
diff --git a/backend/src/main/java/uk/ac/ebi/spot/ols/repository/v2/helpers/V2SearchFieldsParser.java b/backend/src/main/java/uk/ac/ebi/spot/ols/repository/v2/helpers/V2SearchFieldsParser.java
index 6a2cff813..a39c1b461 100644
--- a/backend/src/main/java/uk/ac/ebi/spot/ols/repository/v2/helpers/V2SearchFieldsParser.java
+++ b/backend/src/main/java/uk/ac/ebi/spot/ols/repository/v2/helpers/V2SearchFieldsParser.java
@@ -25,6 +25,7 @@ public static void addSearchFieldsToQuery(OlsSolrQuery query, String searchField
                 query.addSearchField(field.property, field.weight, SearchType.CASE_INSENSITIVE_TOKENS);
             }
         }
+        query.addSearchField("_json", 1, SearchType.CASE_INSENSITIVE_TOKENS);
     }
 
     public static void addBoostFieldsToQuery(OlsSolrQuery query, String boostFields) {
diff --git a/frontend/src/pages/ontologies/ontologiesSlice.ts b/frontend/src/pages/ontologies/ontologiesSlice.ts
index 9314b7fe4..9395981f6 100644
--- a/frontend/src/pages/ontologies/ontologiesSlice.ts
+++ b/frontend/src/pages/ontologies/ontologiesSlice.ts
@@ -132,7 +132,6 @@ export const getEntityWithType = createAsyncThunk(
     { rejectWithValue }
   ) => {
     const apiSearchParams = mapToApiParams(searchParams);
-    apiSearchParams.set("includeObsoleteEntities", "true");
     const doubleEncodedTermUri = encodeURIComponent(
       encodeURIComponent(entityIri)
     );