X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FDBRefUtils.java;h=b7d55592f0cbc19059a570144ae8f7cd9fe68972;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=569a6df486d47e720b116cbd4ad5bba2a0c040fe;hpb=0e2054d29bc49351f000d478659dc3c4371b251c;p=jalview.git
diff --git a/src/jalview/util/DBRefUtils.java b/src/jalview/util/DBRefUtils.java
index 569a6df..b7d5559 100755
--- a/src/jalview/util/DBRefUtils.java
+++ b/src/jalview/util/DBRefUtils.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.util;
@@ -416,11 +418,15 @@ public class DBRefUtils
// check for chaincode and mapping
// PFAM style stockhom PDB citation
com.stevesoft.pat.Regex r = new com.stevesoft.pat.Regex(
- "([0-9][0-9A-Za-z]{3})\\s*(.?)\\s*;([0-9]+)-([0-9]+)");
+ "([0-9][0-9A-Za-z]{3})\\s*(.?)\\s*;\\s*([0-9]+)-([0-9]+)");
if (r.search(acn.trim()))
{
String pdbid = r.stringMatched(1);
String chaincode = r.stringMatched(2);
+ if (chaincode==null)
+ {
+ chaincode = " ";
+ }
String mapstart = r.stringMatched(3);
String mapend = r.stringMatched(4);
if (chaincode.equals(" "))
@@ -431,8 +437,11 @@ public class DBRefUtils
ref = new DBRefEntry(locsrc, version, pdbid + chaincode);
PDBEntry pdbr = new PDBEntry();
pdbr.setId(pdbid);
- pdbr.getProperty().put("CHAIN",chaincode);
+ pdbr.setProperty(new Hashtable());
+ pdbr.getProperty().put("CHAIN", chaincode);
seq.addPDBId(pdbr);
+ } else {
+ System.err.println("Malformed PDB DR line:"+acn);
}
}
else