Skip to content

SAR #2907

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

Merged
georgweiss merged 2 commits into from
Jan 17, 2024
Merged

SAR #2907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bee139f
using match queries searches for both pvName and readbackPvName
shroffk Jan 16, 2024
a15aadb
fixing SAR search unit test
shroffk Jan 16, 2024
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
3 changes: 1 addition & 2 deletions .../save-and-restore/src/main/java/org/phoebus/service/saveandrestore/search/SearchUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,7 @@ public SearchRequest buildSearchRequestForPvs(List<String> pvNames) {
List<Query> pvQueries = new ArrayList<>();
for (String value : pvNames) {
for (String pattern : value.split("[|,;]")) {
pvQueries.add(TermQuery.of(t -> t.field("pvList.pvName").value(pattern.trim()))._toQuery());
pvQueries.add(TermQuery.of(t -> t.field("pvList.readbackPvName").value(pattern.trim()))._toQuery());
pvQueries.add(MatchQuery.of(m -> m.field("pvList").query(pattern.trim()))._toQuery());
}
}
Query pvsQuery = pvQuery.queries(pvQueries).build()._toQuery();
Expand Down
4 changes: 2 additions & 2 deletions ...rc/test/java/org/phoebus/service/saveandrestore/web/controllers/SearchControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void testSearchForPVs() {

SearchRequest searchRequest = searchUtil.buildSearchRequestForPvs(List.of("abc"));
assertEquals(ES_CONFIGURATION_INDEX, searchRequest.index().get(0));
assertEquals("pvList.pvName", searchRequest.query().bool().must().get(0).disMax().queries().get(0).term().field());
assertEquals("abc", searchRequest.query().bool().must().get(0).disMax().queries().get(0).term().value().stringValue());
assertEquals("pvList", searchRequest.query().bool().must().get(0).disMax().queries().get(0).match().field());
assertEquals("abc", searchRequest.query().bool().must().get(0).disMax().queries().get(0).match().query().stringValue());
}
}