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;
public DBRefEntryI getValidSourceDBRef(SequenceI seq)
throws SiftsException
{
- DBRefEntry[] dbRefs = seq.getDBRefs();
- if (dbRefs == null || dbRefs.length < 1)
+ List<DBRefEntry> dbRefs = seq.getPrimaryDBRefs();
+ if (dbRefs == null || dbRefs.size() < 1)
{
throw new SiftsException(
"Source DBRef could not be determined. DBRefs might not have been retrieved.");
}
- for (DBRefEntryI dbRef : dbRefs)
+ for (DBRefEntry dbRef : dbRefs)
{
if (dbRef == null || dbRef.getAccessionId() == null
|| dbRef.getSource() == null)
{
continue;
}
+ String canonicalSource = DBRefUtils.getCanonicalName(dbRef
+ .getSource());
if (isValidDBRefEntry(dbRef)
- && dbRef.isPrimary()
- && (dbRef.getSource().equalsIgnoreCase(DBRefSource.UNIPROT) || dbRef
- .getSource().equalsIgnoreCase(DBRefSource.PDB)))
+ && (canonicalSource.equalsIgnoreCase(DBRefSource.UNIPROT) || canonicalSource
+ .equalsIgnoreCase(DBRefSource.PDB)))
{
return dbRef;
}