Skip to content

Turn a bad (syntax error) query into a working exact string query. #1697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jannistsiroyannis wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Turn a bad (syntax error) query into a working exact string query. #1697

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c06084
Retry a broken query as straigh string query, disregarding any syntax.
jannistsiroyannis Feb 20, 2026
e8a50b9
Handle (one level of) escaping when turning bad query into just a str…
jannistsiroyannis Feb 20, 2026
047af3e
Fix comment.
jannistsiroyannis Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion rest/src/main/groovy/whelk/rest/api/SiteSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,17 @@ Map findData(Map<String, String[]> queryParameters, String baseUri, String path)
Map findDesc = getAndIndexDescription(appId + "find");
queryParameters.put("_appConfig", new String[]{mapper.writeValueAsString(search2.buildAppConfig(findDesc))});
}
return search2.doSearch(queryParameters);
try {
return search2.doSearch(queryParameters);
} catch (InvalidQueryException re) {
// The query is broken. Often this means a bit of text (like a title) was copy-pasted as a query
// without regard for query language syntax. Let's just run the whole thing as a string search.
String[] qArr = queryParameters.get("_q");
// Escape any un-escaped quotes. Totally intuitive, right? And yet not watertight, will actually fail on escaped backslash before quote in query.
qArr[0] = qArr[0].replaceAll("[^\\\\]\"", "\\\\\"");
qArr[0] = "\"" + qArr[0] + "\""; // quote as a whole
return search2.doSearch(queryParameters); // It throws again? So be it - let the crud code return an error.
}
} else {
if (queryParameters.get("_statsrepr") == null && searchSettings.get("statsfind") != null) {
queryParameters.put("_statsrepr", new String[]{mapper.writeValueAsString(searchSettings.get("statsfind"))});
Expand Down
Loading