fixing get_server_path to work as intended

ome · Dec 15, 2023 · bdd2b16 · bdd2b16
1 parent f23afc6
commit bdd2b16
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/generate_omero_objects.py b/src/generate_omero_objects.py
@@ -259,10 +259,12 @@ def get_server_path(anrefs: List[AnnotationRef],
                     ans: List[Annotation]) -> Union[str, None]:
     fpath = None
     for an in anrefs:
-        if isinstance(an, XMLAnnotation):
-            xml_id = an.id
-        else:
-            continue
+        for an_loop in ans:
+            if an.id == an_loop.id:
+                if isinstance(an_loop, XMLAnnotation):
+                    xml_id = an_loop.id
+                else:
+                    continue
     for an_loop in ans:
         if an_loop.id == xml_id:
             if not fpath:

diff --git a/src/generate_xml.py b/src/generate_xml.py
@@ -477,6 +477,7 @@ def create_provenance_metadata(conn: BlitzGateway, img_id: int,
                                ) -> Union[Tuple[MapAnnotation, AnnotationRef],
                                           Tuple[None, None]]:
     global ann_count
+    # needs reworking for XML
     if not metadata:
         return None, None
     software = "omero-cli-transfer"