X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEmblXmlSource.java;h=b2fb8081b0d74ee0155dadc25bf06824548e9277;hb=849ce08f4fdfc619cf1e2f45d6e97884ecac595f;hp=008522136f00a787cda134b3f3e0cfad4ea7c3ac;hpb=9fe87bd08ab29b6fe53364f387d7a2e3a8d39994;p=jalview.git diff --git a/src/jalview/ws/dbsources/EmblXmlSource.java b/src/jalview/ws/dbsources/EmblXmlSource.java index 0085221..b2fb808 100644 --- a/src/jalview/ws/dbsources/EmblXmlSource.java +++ b/src/jalview/ws/dbsources/EmblXmlSource.java @@ -63,8 +63,8 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy try { reply = dbFetch.fetchDataAsFile( - emprefx.toLowerCase() + ":" + query.trim(), "emblxml", null, - ".xml"); + emprefx.toLowerCase() + ":" + query.trim(), "display=xml", + "xml"); } catch (Exception e) { stopQuery(); @@ -102,8 +102,13 @@ public abstract class EmblXmlSource extends EbiFileRetrievedProxy } } + /* + * invalid accession gets a reply with no elements, text content of + * EmbFile reads something like (e.g.) this ungrammatical phrase + * Entry: display type is either not supported or entry is not found. + */ List peptides = new ArrayList(); - if (efile != null) + if (efile != null && efile.getEntries() != null) { for (EmblEntry entry : efile.getEntries()) {