Fulltext fixes for EA 3891

europeana · Aug 1, 2024 · 08c2aa0 · 08c2aa0
1 parent 4bc5e40
commit 08c2aa0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/api/src/main/java/eu/europeana/fulltext/search/model/response/SearchResult.java b/api/src/main/java/eu/europeana/fulltext/search/model/response/SearchResult.java
@@ -1,5 +1,6 @@
 package eu.europeana.fulltext.search.model.response;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import eu.europeana.fulltext.entity.AnnoPage;
 import eu.europeana.fulltext.entity.Annotation;
 
@@ -12,6 +13,10 @@
  * Created on 2 June 2020
  */
 public interface SearchResult {
+
+    @JsonProperty("@context")
+    // note that we only set context for a single annotation and not for an array of annotations part of an annotationpage
+    String[] getContext();
     String getId();
 
     String getType();
@@ -23,5 +28,7 @@ public interface SearchResult {
     void addAnnotationHit(AnnoPage annoPage, Annotation annotation, Hit hit);
 
     List<Hit> getHits();
+
+    void setContext(String[] context);
 }
 
diff --git a/api/src/main/java/eu/europeana/fulltext/search/model/response/v2/SearchResultV2.java b/api/src/main/java/eu/europeana/fulltext/search/model/response/v2/SearchResultV2.java
@@ -15,7 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@JsonPropertyOrder({"id", "type", "debug", "resources", "hits"})
+@JsonPropertyOrder({"context","id", "type", "debug", "resources", "hits"})
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SearchResultV2 implements Serializable, SearchResult {
 
@@ -36,6 +36,11 @@ public SearchResultV2(String searchId, boolean debug) {
         }
     }
 
+    @Override
+    public String[] getContext() {
+        return new String[0];
+    }
+
     @Override
     @JsonProperty("@id")
     public String getId() {
@@ -77,4 +82,9 @@ public void addAnnotationHit(AnnoPage annoPage, Annotation annotation, Hit hit)
     public List<Hit> getHits() {
         return hits;
     }
+
+    @Override
+    public void setContext(String[] context) {
+
+    }
 }
diff --git a/api/src/main/java/eu/europeana/fulltext/search/model/response/v3/SearchResultV3.java b/api/src/main/java/eu/europeana/fulltext/search/model/response/v3/SearchResultV3.java
@@ -14,7 +14,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@JsonPropertyOrder({"id", "type", "debug", "items", "hits"})
+@JsonPropertyOrder({"context","id", "type", "debug", "items", "hits"})
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SearchResultV3 implements Serializable, SearchResult {
 
@@ -34,6 +34,11 @@ public SearchResultV3(String searchId, boolean debug) {
         }
     }
 
+    @Override
+    public String[] getContext() {
+        return new String[0];
+    }
+
     public String getId() {
         return id;
     }
@@ -65,6 +70,11 @@ public List<Hit> getHits() {
         return hits;
     }
 
+    @Override
+    public void setContext(String[] context) {
+
+    }
+
     /**
      * Add an Annotation and optionally a Hit to the search result
      *

diff --git a/api/src/main/java/eu/europeana/fulltext/search/service/FTSearchService.java b/api/src/main/java/eu/europeana/fulltext/search/service/FTSearchService.java
@@ -1,5 +1,9 @@
 package eu.europeana.fulltext.search.service;
 
+import static eu.europeana.iiif.IIIFDefinitions.MEDIA_TYPE_EDM_JSONLD;
+import static eu.europeana.iiif.IIIFDefinitions.MEDIA_TYPE_IIIF_V2;
+import static eu.europeana.iiif.IIIFDefinitions.TEXT_GRANULARITY_CONTEXT;
+
 import dev.morphia.query.internal.MorphiaCursor;
 import eu.europeana.api.commons.error.EuropeanaApiException;
 import eu.europeana.fulltext.AnnotationType;
@@ -89,6 +93,7 @@ public SearchResult searchIssue(String searchId, EuropeanaId europeanaId, String
             findAnnopageAndAnnotations(result, solrResult, europeanaId, pageSize, annoTypes, requestVersion);
         }
         LOG.debug("Search done in {} ms. Found {} annotations", (System.currentTimeMillis() - start), result.itemSize());
+        result.setContext(new String[]{MEDIA_TYPE_IIIF_V2, TEXT_GRANULARITY_CONTEXT,MEDIA_TYPE_EDM_JSONLD});
         return result;
     }