From 078fa4fdd048ddf09431dafb9adf3637db85eefb Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Tue, 16 Apr 2024 17:22:58 +0200
Subject: [PATCH] (valuation) Impose stronger constraints on locality of terms

Clean up logic a bit
---
 .../index/results/IndexResultValuationContext.java    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/code/index/java/nu/marginalia/index/results/IndexResultValuationContext.java b/code/index/java/nu/marginalia/index/results/IndexResultValuationContext.java
index 840b6253..5383cbb9 100644
--- a/code/index/java/nu/marginalia/index/results/IndexResultValuationContext.java
+++ b/code/index/java/nu/marginalia/index/results/IndexResultValuationContext.java
@@ -182,15 +182,12 @@ class PositionOverlapOperator implements CqExpression.LongVisitor {
 
         for (var part : parts) {
             long pv = part.visit(this);
-            if ((pv & WordMetadata.FLAGS_MASK) != 0) {
-                flags |= (pv & WordMetadata.FLAGS_MASK);
-            }
-            else {
-                positions &= pv;
-            }
+
+            flags |= pv;
+            positions &= pv;
         }
 
-        return positions | flags;
+        return positions | (flags & WordMetadata.FLAGS_MASK);
     }
 
     @Override