use AND logic for filter

FNNDSC · Dec 11, 2024 · ddf89ef · ddf89ef
1 parent 756d8cb
commit ddf89ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pacs_query.py b/pacs_query.py
@@ -23,7 +23,7 @@
 )
 logger.remove()
 logger.add(sys.stderr, format=logger_format)
-__version__ = '1.0.2'
+__version__ = '1.0.3'
 
 DISPLAY_TITLE = r"""
        _                                                          

diff --git a/pfdcm.py b/pfdcm.py
@@ -95,12 +95,12 @@ def autocomplete_directive(directive: dict, d_response: dict) -> (list,int):
 
             # iteratively check for all search fields and update the search record simultaneously
             # with SeriesInstanceUID and StudyInstanceUID
-            flag = False
+            flag = True
             for key in directive.keys():
                 if series.get(key) and directive[key].lower() in series[key]["value"].lower():
-                    flag = True
+                    flag = flag and True
                 else:
-                    flag = False
+                    flag = flag and False
             if flag:
                 for label in series:
                     ser[label] = series[label]["value"]