revise wos serializer

Author: Gerit Wagner

search_query/wos/serializer.py

@@ -15,50 +15,32 @@
 # https://images.webofknowledge.com/images/help/WOS/hs_wos_fieldtags.html
 
 
-def to_string_wos(query: Query) -> str:
-    """Serialize the Query tree into a WoS search string."""
+def to_string_wos(query: Query, wrap: bool = False) -> str:
+    """Serialize the Query tree into a Web of Science (WoS) search string."""
 
-    result = ""
-    for child in query.children:
-        if child.operator:
-            # query is operator query
-            if child.value == Operators.NOT:
-                # current element is NOT Operator -> no parenthesis in WoS
-                result = f"{result}{to_string_wos(child)}"
-
-            elif (child == query.children[0]) & (child != query.children[-1]):
-                result = (
-                    f"{result}"
-                    f"{query.search_field.value if query.search_field else ''}"
-                    f"({to_string_wos(child)}"
-                )
-            else:
-                result = f"{result} {query.value} {to_string_wos(child)}"
+    # Leaf node
+    if not query.children:
+        field = query.search_field.value if query.search_field else ""
+        return f"{field}{query.value}"
 
-            if (child == query.children[-1]) & (child.value != Operators.NOT):
-                result = f"{result})"
+    parts = []
+    for child in query.children:
+        if child.operator and child.value == Operators.NOT:
+            # Special handling: inject "NOT ..." directly
+            not_child = child.children[0]
+            not_str = to_string_wos(not_child, wrap=True)
+            parts.append(f"NOT {not_str}")
         else:
-            # query is not an operator
-            if (child == query.children[0]) & (child != query.children[-1]):
-                # current element is first but not only child element
-                # -->operator does not need to be appended again
-                result = (
-                    f"{result}"
-                    f"{query.search_field.value if query.search_field else ''}"
-                    f"({child.search_field.value if child.search_field else ''}"
-                    f"{child.value}"
-                )
+            parts.append(to_string_wos(child, wrap=True))
+
+    joined = f" {query.value} ".join(parts)
 
-            else:
-                # current element is not first child
-                result = (
-                    f"{result} {query.value} "
-                    f"{child.search_field.value if child.search_field else ''}"
-                    f"{child.value}"
-                )
+    if wrap:
+        field = query.search_field.value if query.search_field else ""
+        return f"{field}({joined})"
 
-            if child == query.children[-1]:
-                # current Element is last Element -> closing parenthesis
-                result = f"{result})"
+    # Top-level: wrap=False
+    if query.search_field and all(not c.search_field for c in query.children):
+        return f"{query.search_field.value}({joined})"
 
-    return result
+    return joined

test/test_query_translation.py

@@ -67,7 +67,7 @@ def test_translation_wos_part(query_setup: dict) -> None:
 
 def test_translation_wos_complete(query_setup: dict) -> None:
     query_complete = query_setup["query_complete"]
-    expected = '(TI=("AI" OR "Artificial Intelligence") AND TI=("health care" OR medicine) AND AB=(ethic* OR moral*))'
+    expected = 'TI=("AI" OR "Artificial Intelligence") AND TI=("health care" OR medicine) AND AB=(ethic* OR moral*)'
     translated_query = query_complete.translate(PLATFORM.WOS.value)
     assert translated_query.to_string() == expected