Apply range query to regex queries as well. Fixes bug where regex que…

…ries would always search the whole bible.
AndBible · Oct 14, 2024 · 9e6da6d · 9e6da6d
1 parent 89d6f45
commit 9e6da6d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java b/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
@@ -471,6 +471,7 @@ private void generateSearchIndexImpl(Progress job, List<Key> errors, IndexWriter
                 addField(doc, bodyStemField, canonicalText);
             }
             //osis.getValue() differs from getCanonicalText in that special characters are not separated from words by whitespace.
+            //If regex search should be case sensitive, remove toLowerCase here.
             addField(doc, fullText, osis.getValue().toLowerCase());
 
             if (includeStrongs) {

diff --git a/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryBuilder.java b/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryBuilder.java
@@ -59,12 +59,6 @@ public Query parse(String aSearch) {
 
         int i = 0;
 
-        Matcher regexMatcher = REGEX_PATTERN.matcher(sought);
-        if (regexMatcher.find()) {
-            // The regex needs to match the whole string, so we add parts that always match the start and end of the string.
-            return new RegexpQuery("/.*?" + regexMatcher.group(1) + ".*/");
-        }
-
         Query range = null;
         String rangeModifier = "";
         // Look for a range +[...], -[...], or [...]
@@ -85,10 +79,10 @@ public Query parse(String aSearch) {
                 blurFactor = Integer.parseInt(blur);
             }
             Query left = new BaseQuery(sought.substring(i, blurMatcher.start()));
-            Query right = new BaseQuery(sought.substring(blurMatcher.end()));
+            Query right = parseRest(sought.substring(blurMatcher.end()));
             query = new BlurQuery(left, right, blurFactor);
-        } else if (sought.length() > 0) {
-            query = new BaseQuery(sought);
+        } else if (!sought.isEmpty()) {
+            query = parseRest(sought);
         }
 
         if (range != null && !NULL_QUERY.equals(query)) {
@@ -103,6 +97,19 @@ public Query parse(String aSearch) {
         return query;
     }
 
+    /**
+     * Parse the rest of the query, after range and BlurQuery processing is done.
+     */
+    private Query parseRest(String aSearch) {
+        Matcher regexMatcher = REGEX_PATTERN.matcher(aSearch);
+        if (regexMatcher.find()) {
+            // The regex needs to match the whole string, so we add parts that always match the start and end of the string.
+            return new RegexpQuery("/.*?" + regexMatcher.group(1) + ".*/");
+        } else {
+            return new BaseQuery(aSearch);
+        }
+    }
+
     /**
      * The pattern of a regex query. Currently does not allow "/" characters in the regex string.
      * Probably, "/" characters in text searches are not necessary, later the query can always be improved.