Issue #770. The id of a Patient object should be accessible via an in…

…tuitive API function.
phenotips · Mar 7, 2014 · 55a336e · 55a336e
1 parent c86f541
commit 55a336e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/...l/src/main/java/org/phenotips/data/similarity/internal/AbstractPatientSimilarityView.java b/...l/src/main/java/org/phenotips/data/similarity/internal/AbstractPatientSimilarityView.java
@@ -106,18 +106,7 @@ public String getId()
     @Override
     public String getExternalId()
     {
-        try {
-            for (ImmutablePair<String, String> identifier : this
-                .<ImmutablePair<String, String>>getData("identifiers"))
-            {
-                if (identifier.getKey().equalsIgnoreCase("external_id")) {
-                    return identifier.getValue();
-                }
-            }
-        } catch (Exception ex) {
-            return null;
-        }
-        return null;
+        return this.match.getExternalId();
     }
 
     @Override

diff --git a/...src/main/java/org/phenotips/data/similarity/internal/RestrictedPatientSimilarityView.java b/...src/main/java/org/phenotips/data/similarity/internal/RestrictedPatientSimilarityView.java
@@ -73,6 +73,12 @@ public RestrictedPatientSimilarityView(AbstractPatientSimilarityView openView)
         this(openView.match, openView.reference, openView.access);
     }
 
+    @Override
+    public String getExternalId()
+    {
+        return this.access.isOpenAccess() ? this.match.getExternalId() : null;
+    }
+
     @Override
     public DocumentReference getDocument()
     {