Merge pull request #268 from europeana/EA-2996_impl-geo-distance-search

Ea 2996 impl geo distance search
europeana · Jan 11, 2023 · c7ceb11 · c7ceb11
2 parents 0cfacbd + c3c303c
commit c7ceb11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/corelib-definitions/src/main/java/eu/europeana/corelib/definitions/solr/model/Query.java b/corelib-definitions/src/main/java/eu/europeana/corelib/definitions/solr/model/Query.java
@@ -109,6 +109,13 @@ public Query setQuery(String query) {
         this.query = query;
         return this;
     }
+
+    public Query addGeoParamsToQuery(String sField, String point, String distance){
+        parameterMap.put("sfield", sField);
+        parameterMap.put("pt", point);
+        parameterMap.put("d", distance);
+        return this;
+    }
 
     public String[] getRefinements() {
         return getRefinements(false);

diff --git a/corelib-search/src/main/java/eu/europeana/corelib/search/impl/SearchServiceImpl.java b/corelib-search/src/main/java/eu/europeana/corelib/search/impl/SearchServiceImpl.java
@@ -201,10 +201,12 @@ public <T extends IdBean> ResultSet<T> search(SolrClient solrClient,  Class<T> b
 
     private <T extends IdBean> void setSortAndCursor(Query query, ResultSet<T> resultSet, SolrQuery solrQuery) {
         boolean defaultSort = query.getSorts().isEmpty();
+        // EA-2996 workaround broken search on search_acceptance_publish collection
+        // to be able to test distance search
         if (defaultSort) {
             solrQuery.addSort("score", ORDER.desc);
-            solrQuery.addSort("contentTier", ORDER.desc);
-            solrQuery.addSort("metadataTier", ORDER.desc);
+            //solrQuery.addSort("contentTier", ORDER.desc);   <- TODO uncomment this
+            //solrQuery.addSort("metadataTier", ORDER.desc);  <- TODO uncomment this
             solrQuery.addSort("timestamp_update", ORDER.desc);
             solrQuery.addSort(EUROPEANA_ID, ORDER.asc);
         } else {