From: Jim Procter Date: Tue, 26 Apr 2016 15:53:34 +0000 (+0100) Subject: JAL-2079 allow prefix++suffix type URL signature X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=34de6070282db63a5e0fb3a219459577bf564caf;p=jalview.git JAL-2079 allow prefix++suffix type URL signature --- diff --git a/src/jalview/ws/dbsources/Xfam.java b/src/jalview/ws/dbsources/Xfam.java index a45fbeb..c2ee69a 100644 --- a/src/jalview/ws/dbsources/Xfam.java +++ b/src/jalview/ws/dbsources/Xfam.java @@ -40,10 +40,12 @@ public abstract class Xfam extends DbSourceProxyImpl protected abstract String getXFAMURL(); + @Override public abstract String getDbVersion(); abstract String getXfamSource(); + @Override public AlignmentI getSequenceRecords(String queries) throws Exception { // TODO: this is not a perfect implementation. We need to be able to add @@ -52,7 +54,8 @@ public abstract class Xfam extends DbSourceProxyImpl startQuery(); // TODO: trap HTTP 404 exceptions and return null AlignmentI rcds = new jalview.io.FormatAdapter().readFile(getXFAMURL() - + queries.trim().toUpperCase(), jalview.io.FormatAdapter.URL, + + queries.trim().toUpperCase() + getXFAMURLSUFFIX(), + jalview.io.FormatAdapter.URL, "STH"); for (int s = 0, sNum = rcds.getHeight(); s < sNum; s++) { @@ -70,4 +73,14 @@ public abstract class Xfam extends DbSourceProxyImpl return rcds; } + /** + * default suffix to append the retrieval URL for this source. + * + * @return "" for most Xfam sources + */ + public String getXFAMURLSUFFIX() + { + return ""; + } + }