Handle Annotation File links

Author: will-moore

idr_gallery/templates/idr_gallery/idr_study.html

@@ -56,6 +56,12 @@ <h2>{{ idr_id }}</h2>
             <p>{{ kvp.0 }}: {{ kvp.1 }}</p>
         {% endfor %}
 
+        <hr>
+
+        {% for annotation_file in annotation_files %}
+            <p>Annotation File: <a href="{{ annotation_file.link }}">{{ annotation_file.name }}</a></p>
+        {% endfor %}
+
         <!-- {% if images %}
             <h3>Images</h3>
             <ul>

idr_gallery/utils.py

@@ -46,6 +46,10 @@ def parse_kvp_with_link(key, kvps):
     value = kvps.get(key)[0] if kvps.get(key) else None
     if value is None:
         return None
+    return split_link(value)
+
+
+def split_link(value):
     return {
         "name": value.split("http", 1)[0].strip(),
         "link": "http" + value.split("http", 1)[1] if "http" in value else None

idr_gallery/views.py

@@ -20,7 +20,7 @@
 from .data.background_images import IDR_IMAGES, TISSUE_IMAGES, CELL_IMAGES
 from .data.tabs import TABS
 from .version import VERSION
-from .utils import get_image_info, BIA_URL, parse_kvp_with_link, prefix_http
+from .utils import get_image_info, BIA_URL, parse_kvp_with_link, prefix_http, split_link
 
 try:
     from omero_mapr import mapr_settings
@@ -165,7 +165,7 @@ def study_page(request, idrid, format="html", conn=None, **kwargs):
     containers = []
     for obj in objs:
         desc = obj.description
-        for token in ["Screen Description", "Project Description"]:
+        for token in ["Screen Description", "Project Description", "Experiment Description"]:
             if token in desc:
                 desc = desc.split(token, 1)[1]
         containers.append({
@@ -202,7 +202,7 @@ def study_page(request, idrid, format="html", conn=None, **kwargs):
         bia_id = img_path.split(BIA_URL, 1)[-1].split("/", 1)[0]
 
     KNOWN_KEYS = ["Publication Authors", "Study Title", "Publication Title", "Publication DOI", "Data DOI", "License", 
-                  "PubMed ID", "PMC ID", "Release Date", "External URL"]
+                  "PubMed ID", "PMC ID", "Release Date", "External URL", "Annotation File"]
     other_kvps = []
     for k, v in kvps.items():
         if k in KNOWN_KEYS:
@@ -237,6 +237,7 @@ def study_page(request, idrid, format="html", conn=None, **kwargs):
         "pmc_id": parse_kvp_with_link("PMC ID", kvps),
         "release_date": kvps.get("Release Date")[0] if "Release Date" in kvps else None,
         "external_urls": [prefix_http(url) for url in kvps.get("External URL", [])],
+        "annotation_files": [split_link(link) for link in kvps.get("Annotation File", [])],
         "other_kvps": other_kvps,
         "jsonld": json.dumps(jsonld, indent=2),
     }