X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FXfam.java;h=26291ebf182f75b5526280d545e880db0f85e0f4;hb=6d06be2714c9cba8c69148d5e2d26b50b7051840;hp=3554f0177faf6efc15f549db7b1342f2a950e918;hpb=230fac58c5afe1843bf7177834fe1bd1d7e6f9d5;p=jalview.git diff --git a/src/jalview/ws/dbsources/Xfam.java b/src/jalview/ws/dbsources/Xfam.java index 3554f01..26291eb 100644 --- a/src/jalview/ws/dbsources/Xfam.java +++ b/src/jalview/ws/dbsources/Xfam.java @@ -20,6 +20,7 @@ */ package jalview.ws.dbsources; +import jalview.bin.Cache; import jalview.datamodel.AlignmentI; import jalview.datamodel.DBRefEntry; import jalview.io.DataSourceType; @@ -56,19 +57,26 @@ public abstract class Xfam extends DbSourceProxyImpl // retrieved. startQuery(); // TODO: trap HTTP 404 exceptions and return null - AlignmentI rcds = new FormatAdapter().readFile(getXFAMURL() - + queries.trim().toUpperCase() + getXFAMURLSUFFIX(), + String xfamUrl = getXFAMURL() + queries.trim().toUpperCase() + + getXFAMURLSUFFIX(); + + if (Cache.log != null) + { + Cache.log.debug("XFAM URL for retrieval is: " + xfamUrl); + } + + AlignmentI rcds = new FormatAdapter().readFile(xfamUrl, DataSourceType.URL, FileFormat.Stockholm); + for (int s = 0, sNum = rcds.getHeight(); s < sNum; s++) { rcds.getSequenceAt(s).addDBRef(new DBRefEntry(getXfamSource(), - // getDbSource(), + // getDbSource(), getDbVersion(), queries.trim().toUpperCase())); if (!getDbSource().equals(getXfamSource())) { // add the specific ref too - rcds.getSequenceAt(s).addDBRef( - new DBRefEntry(getDbSource(), getDbVersion(), queries - .trim().toUpperCase())); + rcds.getSequenceAt(s).addDBRef(new DBRefEntry(getDbSource(), + getDbVersion(), queries.trim().toUpperCase())); } } stopQuery();