CSSTUDIO-1891 Ignore unspecified parameters when constructing a searc…

…h query.
ControlSystemStudio · Aug 21, 2023 · 199e8c7 · 199e8c7
1 parent 2f5f875
commit 199e8c7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/...logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java b/...logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java
@@ -64,13 +64,13 @@ private AlarmLogSearchJob(WebResource client, Boolean isNodeTable, ObservableMap
     @Override
     public void run(JobMonitor monitor) {
         String searchString = "searching for alarm log entries : " +
-                searchParameters.entrySet().stream().map(e -> e.getKey() + ":" + e.getValue()).collect(Collectors.joining(","));
+                searchParameters.entrySet().stream().filter(e -> !e.getValue().equals("")).map(e -> e.getKey() + ":" + e.getValue()).collect(Collectors.joining(","));
         logger.log(Level.INFO, "Searching for alarm entries: " + searchString);
         monitor.beginTask(searchString);
         int size = prefs.getInt("results_max_size");
 
         MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
-        searchParameters.forEach((key, value) -> map.add(key.getName(), value));
+        searchParameters.forEach((key, value) -> { if (!value.equals("")) map.add(key.getName(), value); });
         map.putIfAbsent("size", List.of(String.valueOf(size)));
 
         try {

diff --git a/...g-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java b/...g-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java
@@ -56,6 +56,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -286,11 +288,13 @@ protected void updateItem(String item, boolean empty) {
                         .collect(Collectors.joining("&")));
 
         searchParameters.addListener(
-                (MapChangeListener<Keys, String>) change -> query.setText(searchParameters.entrySet().stream()
-                        .sorted(Entry.comparingByKey())
-                        .filter(e -> !e.getKey().getName().equals(Keys.ROOT.getName())) // Exclude alarm config (root) as selection is managed in drop-down
-                        .map((e) -> e.getKey().getName().trim() + "=" + e.getValue().trim())
-                        .collect(Collectors.joining("&"))));
+                (MapChangeListener<Keys, String>) change ->
+                        query.setText(searchParameters.entrySet().stream()
+                                .sorted(Entry.comparingByKey())
+                                .filter(e -> !e.getKey().getName().equals(Keys.ROOT.getName())) // Exclude alarm config (root) as selection is managed in drop-down
+                                .filter(e -> !e.getValue().equals(""))
+                                .map((e) -> e.getKey().getName().trim() + "=" + e.getValue().trim())
+                                .collect(Collectors.joining("&"))));
 
         query.setOnKeyPressed(keyEvent -> {
             if (keyEvent.getCode() == KeyCode.ENTER) {
@@ -470,13 +474,25 @@ public void resize() {
     @FXML
     void updateQuery() {
         List<String> searchTerms = Arrays.asList(query.getText().split("&"));
+        Set<String> searchKeywords = new TreeSet<>();
         searchTerms.forEach(s -> {
-            String key = s.split("=")[0];
-            String value = s.split("=")[1];
-            if (lookup.containsKey(key)) {
-                searchParameters.put(lookup.get(key), value);
+            String[] splitString = s.split("=");
+            if (splitString.length > 1) {
+                String key = splitString[0];
+                searchKeywords.add(key);
+                String value = splitString[1];
+                if (lookup.containsKey(key)) {
+                    searchParameters.put(lookup.get(key), value);
+                }
             }
         });
+
+        for (Keys key : searchParameters.keySet()) {
+            if (!searchKeywords.contains(key.toString())) {
+                searchParameters.put(key, "");
+            }
+        }
+
         // Add root (alarm config) separately as it is selected differently by user,
         // i.e. from drop-down rather than typing into the text field.
         searchParameters.put(Keys.ROOT, configSelection.getText());