Revert "Revert "Bratseth/phrase segmenting feature flag""

This reverts commit c72315a338a02858c8371d3d70fe091c43b672dd.

1 files changed, 14 insertions, 3 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
index 5e292a06b0f..9ba6c1a8101 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
@@ -442,9 +442,9 @@ abstract class StructuredParser extends AbstractParser {
         Item item = null;
 
         try {
-            if (!tokens.currentIs(WORD)
-                    && ((!tokens.currentIs(NUMBER) && !tokens.currentIs(MINUS)
-                    && !tokens.currentIs(UNDERSCORE)) || (!submodes.url && !submodes.site))) {
+            if ( ! tokens.currentIs(WORD)
+                && ((!tokens.currentIs(NUMBER) && !tokens.currentIs(MINUS)
+                && !tokens.currentIs(UNDERSCORE)) || (!submodes.url && !submodes.site))) {
                 return null;
             }
             Token word = tokens.next();
@@ -557,6 +557,7 @@ abstract class StructuredParser extends AbstractParser {
 
             if (composite != null) {
                 composite.addItem(word);
+                connectLastTermsIn(composite);
             } else if (firstWord != null) {
                 if (submodes.site || submodes.url) {
                     UriItem uriItem = new UriItem();
@@ -584,6 +585,7 @@ abstract class StructuredParser extends AbstractParser {
                 }
                 composite.addItem(firstWord);
                 composite.addItem(word);
+                connectLastTermsIn(composite);
             } else if (word instanceof PhraseItem) {
                 composite = (PhraseItem)word;
             } else {
@@ -654,6 +656,15 @@ abstract class StructuredParser extends AbstractParser {
         }
     }
 
+    private void connectLastTermsIn(CompositeItem composite) {
+        int items = composite.items().size();
+        if (items < 2) return;
+        Item nextToLast = composite.items().get(items - 2);
+        Item last = composite.items().get(items - 1);
+        if ( ! (nextToLast instanceof TermItem)) return;
+        ((TermItem)nextToLast).setConnectivity(last, 1);
+    }
+
     private boolean addStartMarking() {
         if (submodes.explicitAnchoring() && tokens.currentIs(HAT)) {
             tokens.skip();