From f758c90d9b0dbe7a058bacdc584e4e4a3973dddb Mon Sep 17 00:00:00 2001 From: Hugh Cayless Date: Mon, 15 Nov 2021 07:57:00 -0500 Subject: [PATCH] Fix for #79. --- pn-dispatcher/pom.xml | 2 +- .../info/papyri/dispatch/browse/facet/StringSearchFacet.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pn-dispatcher/pom.xml b/pn-dispatcher/pom.xml index d717e514..8ffbb566 100644 --- a/pn-dispatcher/pom.xml +++ b/pn-dispatcher/pom.xml @@ -5,7 +5,7 @@ info.papyri pn-dispatcher war - 1.1.13 + 1.1.14 pn-dispatcher https://maven.apache.org diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/browse/facet/StringSearchFacet.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/browse/facet/StringSearchFacet.java index 4430d02a..3f77f364 100644 --- a/pn-dispatcher/src/main/java/info/papyri/dispatch/browse/facet/StringSearchFacet.java +++ b/pn-dispatcher/src/main/java/info/papyri/dispatch/browse/facet/StringSearchFacet.java @@ -2345,10 +2345,9 @@ String convertCharProxToRegexSyntax(String prevTerm, String nextTerm, String cha String numChars = charProxMatcher.group(1); String operator = charProxMatcher.group(2); String distRegex = ".{1," + numChars + "}"; - // # is conventionally used to indicate word-boundaries on the user-end - prevTerm = prevTerm.replaceAll("#", " ").replace("\\s+", " "); - nextTerm = nextTerm.replaceAll("#", " ").replace("\\s+", " "); String regex = prevTerm.trim() + distRegex + nextTerm.trim(); + // # is conventionally used to indicate word-boundaries on the user-end + regex = regex.replaceAll("#", " ").replace("\\s+", " "); if(operator.equals("w")) return regex; // if we are doing an unordered proximity search we also need to invert the terms String revRegex = nextTerm.trim() + distRegex + prevTerm.trim();