commit fe72f71cad0a4432a8bccc70af5d9cc498fa7bc1
author Andy Seaborne <andy@apache.org> Thu Jul 02 12:33:22 2020 +0100
committer GitHub <noreply@github.com> Thu Jul 02 12:33:22 2020 +0100
tree 53964e31e570cb69130a148dc1173d92d90ce889
parent 63e798679ae82021a9b206e5c6268e79b2d163f7
parent 14ef282e054b401b63756f6f8eab59e2eef98380

Merge pull request #770 from strangepleasures/JENA-1932

JENA-1932 Elasticsearch text index incorrectly maps properties to fields

jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java

diff --git a/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java b/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java
index 0955cfd..751366f 100644
--- a/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java
+++ b/jena-text-es/src/main/java/org/apache/jena/query/text/es/TextIndexES.java
@@ -393,7 +393,12 @@
             limit = MAX_RESULTS;
         
         if(property != null) {
-            qs = parse(property.getLocalName(), qs, lang);
+            String field = docDef.getField(property);
+            if (field == null) {
+                LOGGER.warn("No field mapping for property " + property);
+                return Collections.emptyList();
+            }
+            qs = parse(field, qs, lang);
         } else {
             qs = parse(null, qs, lang);
         }