From afb0078682210e6853e526b69ed30f6b6dd931f0 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Wed, 31 Aug 2016 17:21:58 +0100 Subject: [PATCH 1/1] JAL-1926 JAL-2106 resolve source DB refs using canonical dbsource match --- src/jalview/ws/sifts/SiftsClient.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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; } -- 1.7.10.2