JAL-3116 unit tests adapted to EMBL over JAXB

[jalview.git] / src / jalview / ws / dbsources / EmblXmlSource.java

diff --git a/src/jalview/ws/dbsources/EmblXmlSource.java b/src/jalview/ws/dbsources/EmblXmlSource.java
index 8f55080..e114ea9 100644 (file)
--- a/src/jalview/ws/dbsources/EmblXmlSource.java
+++ b/src/jalview/ws/dbsources/EmblXmlSource.java
@@ -85,7 +85,7 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy
    * @return
    * @throws Exception
    */
-  public AlignmentI getEmblSequenceRecords(String emprefx, String query)
+  protected AlignmentI getEmblSequenceRecords(String emprefx, String query)
           throws Exception
   {
     startQuery();
@@ -118,7 +118,7 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy
    * @return
    * @throws Exception
    */
-  public AlignmentI getEmblSequenceRecords(String emprefx, String query,
+  protected AlignmentI getEmblSequenceRecords(String emprefx, String query,
           File reply) throws Exception
   {
     List<EntryType> entries = null;
@@ -244,14 +244,18 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy
     /*
      * add db references
      */
-    List<XrefType> dbRefs = entry.getXref();
-    if (dbRefs != null)
+    List<XrefType> xrefs = entry.getXref();
+    if (xrefs != null)
     {
-      for (XrefType dbref : dbRefs)
+      for (XrefType xref : xrefs)
       {
-        String acc = dbref.getId();
-        String source = DBRefUtils.getCanonicalName(dbref.getDb());
-        String version = dbref.getSecondaryId();
+        String acc = xref.getId();
+        String source = DBRefUtils.getCanonicalName(xref.getDb());
+        String version = xref.getSecondaryId();
+        if (version == null || "".equals(version))
+        {
+          version = "0";
+        }
         dna.addDBRef(new DBRefEntry(source, version, acc));
       }
     }
@@ -524,10 +528,14 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy
          * ensure UniProtKB/Swiss-Prot converted to UNIPROT
          */
         String source = DBRefUtils.getCanonicalName(xref.getDb());
-        DBRefEntry dbref = new DBRefEntry(source, xref.getSecondaryId(),
-                xref.getId());
-        DBRefEntry proteinDbRef = new DBRefEntry(dbref.getSource(),
-                dbref.getVersion(), dbref.getAccessionId());
+        String version = xref.getSecondaryId();
+        if (version == null || "".equals(version))
+        {
+          version = "0";
+        }
+        DBRefEntry dbref = new DBRefEntry(source, version, xref.getId());
+        DBRefEntry proteinDbRef = new DBRefEntry(source, version,
+                dbref.getAccessionId());
         if (source.equals(DBRefSource.UNIPROT))
         {
           String proteinSeqName = DBRefSource.UNIPROT + "|"