git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4366 JAL-4371 tighten up detection of chain code and allow two-character codes...
[jalview.git]
/
src
/
jalview
/
struture
/
PDBEntryUtils.java
diff --git
a/src/jalview/struture/PDBEntryUtils.java
b/src/jalview/struture/PDBEntryUtils.java
index
08d192f
..
2d67434
100644
(file)
--- a/
src/jalview/struture/PDBEntryUtils.java
+++ b/
src/jalview/struture/PDBEntryUtils.java
@@
-61,7
+61,7
@@
public class PDBEntryUtils
}
return targetChainId;
}
}
return targetChainId;
}
- protected static Pattern id_and_chain=Pattern.compile("(\\d[0-9A-Za-z]{3})[_:]?(.+)*");
+ protected static Pattern id_and_chain=Pattern.compile("(\\d[0-9A-Za-z]{3})[_:|]?(.{1,2})?");
public static List<PDBEntry> inferPDBEntry(SequenceI seq)
{
public static List<PDBEntry> inferPDBEntry(SequenceI seq)
{
@@
-145,6
+145,8
@@
public class PDBEntryUtils
putativeEntry = pdbe;
return putativeEntry;
}
putativeEntry = pdbe;
return putativeEntry;
}
+ } else {
+ return pdbe;
}
}
return null;
}
}
return null;