Merge pull request #1203 from EBISPOT/fix-search-issue

Fixes search issue

Author: haideriqbal

backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/SolrFieldMapper.java

@@ -31,6 +31,9 @@ public static List<String> mapFieldsList(Collection<String> ols3FieldNames) {
             } else if (legacyFieldName.endsWith("_e")) {
                 prefix = "edge_";
                 legacyFieldName = legacyFieldName.substring(0, legacyFieldName.length() - 2);
+            } else if (legacyFieldName.endsWith("_w")) {
+                prefix = "whitespace_";
+                legacyFieldName = legacyFieldName.substring(0, legacyFieldName.length() - 2);
             }
 
             if (legacyFieldName.equals("iri")) {

backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SearchController.java

@@ -142,8 +142,7 @@ public void search(
                 solrQuery.set("defType", "edismax");
                 solrQuery.setQuery(query);
 
-                String[] fields = {LABEL.getText()+"_s^5", SYNONYM.getText()+"_s^3", DEFINITION.getText(), "short_form_s^2", "obo_id_s^2", "iri_s", "annotations_trimmed", "curatedFrom_s^0.5"};
-
+                String[] fields = {LABEL.getText()+"_w^5", SYNONYM.getText()+"_w^3", DEFINITION.getText()+"_w", "short_form_w^2", "obo_id_w^2", "iri_s", "annotations_trimmed_w", "curatedFrom_w^0.5"};
                 solrQuery.set("qf", String.join(" ", SolrFieldMapper.mapFieldsList(List.of(fields))));
 
                 solrQuery.set("bq",
@@ -174,7 +173,8 @@ public void search(
             for(String ontologyId : ontologies)
                 Validation.validateOntologyId(ontologyId);
 
-            solrQuery.addFilterQuery("ontologyId: (" + String.join(" OR ", ontologies) + ")");
+            List<String> lowercasedOntologies = ontologies.stream().map(String::toLowerCase).collect(Collectors.toList());
+            solrQuery.addFilterQuery("ontologyId: (" + String.join(" OR ", lowercasedOntologies) + ")");
         }
 
         if (slims != null) {