Revert "Revert "Validate prefix matching""

This reverts commit 875018f7acb1bbd9f186b97d177be296ff157ba7.

2 files changed, 11 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/Index.java b/container-search/src/main/java/com/yahoo/prelude/Index.java
index e245faec919..af8f63ab9f2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/Index.java
+++ b/container-search/src/main/java/com/yahoo/prelude/Index.java
@@ -36,6 +36,7 @@ public class Index {
     private boolean hostIndex = false;
     private StemMode stemMode = StemMode.NONE;
     private boolean isAttribute = false;
+    private boolean isIndex = false;
     private boolean isDefaultPosition = false;
     private boolean dynamicSummary=false;
     private boolean highlightSummary=false;
@@ -157,6 +158,8 @@ public class Index {
             setNGram(true, Integer.parseInt(command.substring(6)));
         } else if (command.equals("attribute")) {
             setAttribute(true);
+        } else if (command.equals("index")) {
+            setIndex(true);
         } else if (command.equals("default-position")) {
             setDefaultPosition(true);
         } else if (command.equals("plain-tokens")) {
@@ -273,6 +276,12 @@ public class Index {
         this.isAttribute = isAttribute;
     }
 
+    public boolean isIndex() { return isIndex; }
+
+    public void setIndex(boolean isIndex) {
+        this.isIndex = isIndex;
+    }
+
     public boolean hasPlainTokens() { return plainTokens; }
 
     public void setPlainTokens(boolean plainTokens) {
diff --git a/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java b/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
index 1d9e32ec374..a232841f29f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
+++ b/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
@@ -86,12 +86,13 @@ public class SearchDefinition {
         return idx;
     }
 
-    public void addCommand(String indexName, String commandString) {
+    public Index addCommand(String indexName, String commandString) {
         Index index = getOrCreateIndex(indexName);
         index.addCommand(commandString);
         if (index.isDefaultPosition()) {
             defaultPosition = index.getName();
         }
+        return index;
     }
 
 }