Feature search / Identify entry points to enable feature searches.

fxprunayre · Jun 17, 2024 · 4212d1f · 4212d1f
1 parent 933b8c6
commit 4212d1f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/core/src/main/java/org/fao/geonet/kernel/search/EsFilterBuilder.java b/core/src/main/java/org/fao/geonet/kernel/search/EsFilterBuilder.java
@@ -72,7 +72,7 @@ public static String build(ServiceContext context, String type, boolean isSearch
         }
 
         if (!isSearchingForDraft) {
-            query.append(" AND (draft:n OR draft:e)");
+//            query.append(" AND (draft:n OR draft:e OR -_exists_:draft)");
         }
 
         final String portalFilter = EsFilterBuilder.buildPortalFilter(node);

diff --git a/services/src/main/java/org/fao/geonet/api/es/EsHTTPProxy.java b/services/src/main/java/org/fao/geonet/api/es/EsHTTPProxy.java
@@ -409,7 +409,8 @@ private void call(ServiceContext context, HttpSession httpSession, HttpServletRe
                      String endPoint, String body,
                      String selectionBucket,
                      RelatedItemType[] relatedTypes) throws Exception {
-        final String url = client.getServerUrl() + "/" + defaultIndex + "/" + endPoint + "?";
+        String index = request.getParameter("index");
+        final String url = client.getServerUrl() + "/" + (StringUtils.isNotEmpty(index) ? index : defaultIndex) + "/" + endPoint + "?";
         // Make query on multiple indices
 //        final String url = client.getServerUrl() + "/" + defaultIndex + ",gn-features/" + endPoint + "?";
         if (SEARCH_ENDPOINT.equals(endPoint) || MULTISEARCH_ENDPOINT.equals(endPoint)) {
@@ -686,7 +687,7 @@ private void processResponse(ServiceContext context, HttpSession httpSession,
                     addRelatedTypes(doc, relatedTypes, context);
                 }
 
-                if (doc.has("_source")) {
+                if (doc.has("_source") && doc.get("_source").has("documentStandard")) {
                     ObjectNode sourceNode = (ObjectNode) doc.get("_source");
 
                     String metadataSchema = doc.get("_source").get("documentStandard").asText();

diff --git a/web-ui/src/main/resources/catalog/js/CatController.js b/web-ui/src/main/resources/catalog/js/CatController.js
@@ -325,21 +325,21 @@
                 {
                   filter: { match: { "cl_status.key": "superseded" } },
                   weight: 0.3
-                },
+                }
                 // {
                 //   "filter": { "match": { "cl_resourceScope": "service" } },
                 //   "weight": 0.8
                 // },
                 // Start boosting down records more than 3 months old
-                {
-                  gauss: {
-                    changeDate: {
-                      scale: "365d",
-                      offset: "90d",
-                      decay: 0.5
-                    }
-                  }
-                }
+                // {
+                //   gauss: {
+                //     changeDate: {
+                //       scale: "365d",
+                //       offset: "90d",
+                //       decay: 0.5
+                //     }
+                //   }
+                // }
               ],
               score_mode: "multiply"
             },

diff --git a/web-ui/src/main/resources/catalog/views/default/module.js b/web-ui/src/main/resources/catalog/views/default/module.js
@@ -552,7 +552,7 @@
         advancedMode: false,
         from: 1,
         to: 20,
-        selectionBucket: "s101",
+        selectionBucket: "s101&index=gn-*",
         viewerMap: viewerMap,
         searchMap: searchMap,
         mapfieldOption: {
@@ -562,7 +562,7 @@
         hitsperpageValues: gnSearchSettings.hitsperpageValues,
         filters: gnSearchSettings.filters,
         defaultParams: {
-          isTemplate: "n",
+          // isTemplate: "n",
           resourceTemporalDateRange: {
             range: {
               resourceTemporalDateRange: {
@@ -576,7 +576,7 @@
           sortOrder: sortConfig[1] || ""
         },
         params: {
-          isTemplate: "n",
+          // isTemplate: "n",
           resourceTemporalDateRange: {
             range: {
               resourceTemporalDateRange: {

diff --git a/web/src/main/webapp/WEB-INF/data/config/index/features.json b/web/src/main/webapp/WEB-INF/data/config/index/features.json
@@ -59,7 +59,7 @@
           "match": "ft_*_s",
           "mapping": {
             "type": "keyword",
-            "copy_to": "any"
+            "copy_to": "any.default"
           }
         }
       },
@@ -85,7 +85,17 @@
     ],
     "properties": {
       "any": {
-        "type": "text"
+        "type": "object",
+        "properties": {
+          "default": {
+            "type": "text",
+             "analyzer": "standard"
+          },
+          "common": {
+            "type": "text",
+            "analyzer": "standard"
+          }
+        }
       },
       "id": {
         "type": "keyword"
@@ -98,11 +108,11 @@
       },
       "resourceType": {
         "type": "keyword",
-        "copy_to": "any"
+        "copy_to": ["any.default"]
       },
       "resourceTitle": {
         "type": "text",
-        "copy_to": "any",
+        "copy_to": ["any.default"],
         "fields": {
           "keyword": {
             "type": "keyword",