git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2976 patch NPE when trying to open Uniprot FTS
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
Xfam.java
diff --git
a/src/jalview/ws/dbsources/Xfam.java
b/src/jalview/ws/dbsources/Xfam.java
index
3554f01
..
b83f558
100644
(file)
--- a/
src/jalview/ws/dbsources/Xfam.java
+++ b/
src/jalview/ws/dbsources/Xfam.java
@@
-20,6
+20,7
@@
*/
package jalview.ws.dbsources;
*/
package jalview.ws.dbsources;
+import jalview.bin.Cache;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.io.DataSourceType;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.io.DataSourceType;
@@
-41,7
+42,12
@@
public abstract class Xfam extends DbSourceProxyImpl
super();
}
super();
}
- protected abstract String getXFAMURL();
+ /**
+ * the base URL for this Xfam-like service
+ *
+ * @return
+ */
+ protected abstract String getURLPrefix();
@Override
public abstract String getDbVersion();
@Override
public abstract String getDbVersion();
@@
-56,25
+62,37
@@
public abstract class Xfam extends DbSourceProxyImpl
// retrieved.
startQuery();
// TODO: trap HTTP 404 exceptions and return null
// retrieved.
startQuery();
// TODO: trap HTTP 404 exceptions and return null
- AlignmentI rcds = new FormatAdapter().readFile(getXFAMURL()
- + queries.trim().toUpperCase() + getXFAMURLSUFFIX(),
+ String xfamUrl = getURL(queries);
+
+ if (Cache.log != null)
+ {
+ Cache.log.debug("XFAM URL for retrieval is: " + xfamUrl);
+ }
+
+ AlignmentI rcds = new FormatAdapter().readFile(xfamUrl,
DataSourceType.URL, FileFormat.Stockholm);
DataSourceType.URL, FileFormat.Stockholm);
+
for (int s = 0, sNum = rcds.getHeight(); s < sNum; s++)
{
rcds.getSequenceAt(s).addDBRef(new DBRefEntry(getXfamSource(),
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
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();
return rcds;
}
}
}
stopQuery();
return rcds;
}
+ String getURL(String queries)
+ {
+ return getURLPrefix() + "/family/" + queries.trim().toUpperCase()
+ + getURLSuffix();
+ }
+
/**
* Pfam and Rfam provide alignments
*/
/**
* Pfam and Rfam provide alignments
*/
@@
-89,7
+107,7
@@
public abstract class Xfam extends DbSourceProxyImpl
*
* @return "" for most Xfam sources
*/
*
* @return "" for most Xfam sources
*/
- public String getXFAMURLSUFFIX()
+ public String getURLSuffix()
{
return "";
}
{
return "";
}