Skip to content

Commit df81715

Browse files
removed some log output used for debugging
1 parent e7e33a6 commit df81715

File tree

4 files changed

+2
-27
lines changed

4 files changed

+2
-27
lines changed

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/search/SearchAndFilterViewController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
230230
if (e.getCode() == KeyCode.ENTER) {
231231
LOGGER.log(Level.INFO, "ENTER has been pressed in uniqueIdTextField");
232232
LOGGER.log(Level.INFO, "uniqueIdProperty: " + uniqueIdProperty.getValueSafe());
233-
if (uniqueIdProperty.isEmpty().get()) {
234-
LOGGER.log(Level.INFO, "uniqueIdString: is empty");
235-
} else {
233+
if (!uniqueIdProperty.isEmpty().get()) {
236234
searchResultTableViewController.uniqueIdSearch(uniqueIdProperty.getValueSafe());
237235
}
238236
}

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/search/SearchResultTableViewController.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ public void search() {
328328

329329
public void search(final String query) {
330330
queryString = query;
331-
LOGGER.log(Level.INFO, "search() query: = " + queryString);
332331
Map<String, String> searchParams =
333332
SearchQueryUtil.parseHumanReadableQueryString(queryString);
334333
LOGGER.log(Level.INFO, "search() searchParams: = " + searchParams);
@@ -370,7 +369,6 @@ void uniqueIdSearch(final String uniqueIdString) {
370369
try {
371370
/* Search with the uniqueID */
372371
Node uniqueIdNode = SaveAndRestoreService.getInstance().getNode(uniqueIdString);
373-
LOGGER.log(Level.INFO, "uniqueIDNode: " + uniqueIdNode);
374372

375373
/* Check that there are results, then fill table - should be at most one result */
376374
if (uniqueIdNode != null) {

app/save-and-restore/model/src/main/java/org/phoebus/applications/saveandrestore/model/search/SearchQueryUtil.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import java.util.Map;
2727
import java.util.function.Function;
2828
import java.util.stream.Collectors;
29-
import java.util.logging.Logger;
30-
import java.util.logging.Level;
3129

3230
public class SearchQueryUtil {
3331

@@ -79,8 +77,6 @@ public static Keys findKey(String keyName) {
7977
}
8078
}
8179

82-
private static final Logger LOGGER = Logger.getLogger(SearchQueryUtil.class.getName());
83-
8480
/**
8581
* This method parses a logbook query string and returns a map of search keys and their associated search patterns as
8682
* values.
@@ -124,8 +120,6 @@ public static String toQueryString(Map<String, String> queryParams){
124120
* @return A formatted string with trimmed values, e.g. "a,b" rather than " a , b".
125121
*/
126122
private static String formatSearchTerm(String searchTerm){
127-
LOGGER.log(Level.INFO, "formatSearchTerm() input: [" + searchTerm + "]");
128-
129123
if(searchTerm == null || searchTerm.isEmpty()){
130124
return "";
131125
}

services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/search/SearchUtil.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
7575
LOG.info(" searchParameters: " + searchParameters);
7676

7777
for (Entry<String, List<String>> parameter : searchParameters.entrySet()) {
78-
LOG.info(" key: " + parameter.getKey().strip().toLowerCase());
7978
switch (parameter.getKey().strip().toLowerCase()) {
8079
case "uniqueid":
8180
for (String value : parameter.getValue()) {
@@ -84,14 +83,12 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
8483
}
8584
}
8685
break;
86+
8787
// Search for node name. List of names cannot be split on space char as it is allowed in a node name.
8888
case "name":
8989
for (String value : parameter.getValue()) {
90-
LOG.info(" value: [" + value + "]");
9190
for (String pattern : getSearchTerms(value)) {
92-
// for (String pattern : value.split("[|,;]")) {
9391
String term = pattern.trim().toLowerCase();
94-
LOG.info(" term: [" + term + "]");
9592
// Quoted strings will be mapped to a phrase query
9693
if(term.startsWith("\"") && term.endsWith("\"")){
9794
nodeNamePhraseTerms.add(term.substring(1, term.length() - 1));
@@ -108,10 +105,8 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
108105
case "desc":
109106
case "description":
110107
for (String value : parameter.getValue()) {
111-
LOG.info(" value: [" + value + "]");
112108
for (String pattern : getSearchTerms(value)) {
113109
String term = pattern.trim().toLowerCase();
114-
LOG.info(" term: [" + term + "]");
115110
// Quoted strings will be mapped to a phrase query
116111
if (term.startsWith("\"") && term.endsWith("\"")) {
117112
descriptionPhraseTerms.add(term.substring(1, term.length() - 1));
@@ -240,11 +235,8 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
240235
}
241236
}
242237

243-
LOG.info(" descriptionTerms: " + descriptionTerms);
244-
LOG.info(" descriptionTerms.isEmpty() : " + descriptionTerms.isEmpty());
245238
// Add the description query. Multiple search terms will be AND:ed.
246239
if (!descriptionTerms.isEmpty()) {
247-
LOG.info(" fuzzySearch: " + fuzzySearch);
248240
for (String searchTerm : descriptionTerms) {
249241
NestedQuery innerNestedQuery;
250242
if (fuzzySearch) {
@@ -258,8 +250,6 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
258250
}
259251
}
260252

261-
LOG.info(" descriptionPhraseTerms: " + descriptionPhraseTerms);
262-
LOG.info(" descriptionPhraseTerms.isEmpty() : " + descriptionPhraseTerms.isEmpty());
263253
// Add phrase queries for the description key. Multiple search terms will be AND:ed.
264254
if (!descriptionPhraseTerms.isEmpty()) {
265255
for (String searchTerm : descriptionPhraseTerms) {
@@ -274,11 +264,8 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
274264
boolQueryBuilder.must(IdsQuery.of(id -> id.values(uniqueIdTerms))._toQuery());
275265
}
276266

277-
LOG.info(" nodeNameTerms: " + nodeNameTerms);
278-
LOG.info(" nodeNameTerms.isEmpty() : " + nodeNameTerms.isEmpty());
279267
// Add the description query. Multiple search terms will be AND:ed.
280268
if (!nodeNameTerms.isEmpty()) {
281-
LOG.info(" fuzzySearch: " + fuzzySearch);
282269
for (String searchTerm : nodeNameTerms) {
283270
NestedQuery innerNestedQuery;
284271
if (fuzzySearch) {
@@ -292,8 +279,6 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
292279
}
293280
}
294281

295-
LOG.info(" nodeNamePhraseTerms: " + nodeNamePhraseTerms);
296-
LOG.info(" nodeNamePhraseTerms.isEmpty() : " + nodeNamePhraseTerms.isEmpty());
297282
// Add phrase queries for the nodeName key. Multiple search terms will be AND:ed.
298283
if (!nodeNamePhraseTerms.isEmpty()) {
299284
for (String searchTerm : nodeNamePhraseTerms) {

0 commit comments

Comments
 (0)