From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 31 Aug 2016 16:21:58 +0000 (+0100)
Subject: JAL-1926 JAL-2106 resolve source DB refs using canonical dbsource match
X-Git-Tag: Release_2_10_0~47^2~4^2~23
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=afb0078682210e6853e526b69ed30f6b6dd931f0;p=jalview.git

JAL-1926 JAL-2106 resolve source DB refs using canonical dbsource match
---

diff --git a/src/jalview/ws/sifts/SiftsClient.java b/src/jalview/ws/sifts/SiftsClient.java
index 0ab6e7d..dad2b3f 100644
--- a/src/jalview/ws/sifts/SiftsClient.java
+++ b/src/jalview/ws/sifts/SiftsClient.java
@@ -29,6 +29,7 @@ import jalview.datamodel.SequenceI;
 import jalview.io.StructureFile;
 import jalview.schemes.ResidueProperties;
 import jalview.structure.StructureMapping;
+import jalview.util.DBRefUtils;
 import jalview.util.Format;
 import jalview.xml.binding.sifts.Entry;
 import jalview.xml.binding.sifts.Entry.Entity;
@@ -339,8 +340,10 @@ public class SiftsClient implements SiftsClientI
       }
       if (isValidDBRefEntry(dbRef)
               && dbRef.isPrimary()
-              && (dbRef.getSource().equalsIgnoreCase(DBRefSource.UNIPROT) || dbRef
-                      .getSource().equalsIgnoreCase(DBRefSource.PDB)))
+              && (DBRefUtils.getCanonicalName(dbRef.getSource())
+                      .equalsIgnoreCase(DBRefSource.UNIPROT) || DBRefUtils
+                      .getCanonicalName(dbRef.getSource())
+                      .equalsIgnoreCase(DBRefSource.PDB)))
       {
         return dbRef;
       }