Fix parsing of PN data elements with empty value

Author: hackermd

src/dicomweb_client/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.10.0'
+__version__ = '0.10.1'
 
 from dicomweb_client.api import DICOMwebClient

src/dicomweb_client/api.py

@@ -94,18 +94,20 @@ def _create_dataelement(tag, vr, value):
         elem_value = []
         for v in value:
             if not isinstance(v, dict):
-                # Some DICOMweb services get this wrong, so we workaround it
-                # and issue a warning rather than raising an error.
+                # Some DICOMweb services get this wrong, so we workaround the
+                # the issue and warn the user rather than raising an error.
                 logger.warning(
                     'attribute with VR Person Name (PN) is not '
                     'formatted correctly'
                 )
                 elem_value.append(v)
             else:
-                # TODO: How to handle "Ideographic" and "Phonetic"?
-                elem_value.append(v['Alphabetic'])
+                elem_value.extend(list(v.values()))
         if vm == '1':
-            elem_value = elem_value[0]
+            try:
+                elem_value = elem_value[0]
+            except IndexError:
+                elem_value = None
     else:
         if vm == '1':
             if vr in binary_representations:

src/dicomweb_client/tests/test_api.py

@@ -311,24 +311,50 @@ def test_load_json_dataset_tm(httpserver, client, cache_dir):
 
 
 def test_load_json_dataset_pn_vm1(httpserver, client, cache_dir):
-    value = ['Only^Person']
+    name = 'Only^Person'
+    value = [{'Alphabetic': name}]
     dicom_json = {
         '00080090': {
             'vr': 'PN',
             'Value': value,
         },
     }
     dataset = load_json_dataset(dicom_json)
-    assert dataset.ReferringPhysicianName == value[0]
+    assert dataset.ReferringPhysicianName == name
 
 
 def test_load_json_dataset_pn_vm2(httpserver, client, cache_dir):
-    value = ['First^Person', 'Second^Person']
+    names = ['First^Person', 'Second^Person']
+    value = [{'Alphabetic': names[0]}, {'Alphabetic': names[1]}]
     dicom_json = {
         '0008009C': {
             'vr': 'PN',
             'Value': value,
         },
     }
     dataset = load_json_dataset(dicom_json)
-    assert dataset.ConsultingPhysicianName == value
+    assert dataset.ConsultingPhysicianName == names
+
+
+def test_load_json_dataset_pn_vm1_empty(httpserver, client, cache_dir):
+    value = [{}]
+    dicom_json = {
+        '00080090': {
+            'vr': 'PN',
+            'Value': value,
+        },
+    }
+    dataset = load_json_dataset(dicom_json)
+    assert dataset.ReferringPhysicianName == ''
+
+
+def test_load_json_dataset_pn_vm2_empty(httpserver, client, cache_dir):
+    value = [{}]
+    dicom_json = {
+        '0008009C': {
+            'vr': 'PN',
+            'Value': value,
+        },
+    }
+    dataset = load_json_dataset(dicom_json)
+    assert dataset.ConsultingPhysicianName == []