X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fseqfetcher%2FASequenceFetcher.java;h=2ed32636d7b1e84daca7d3f6e78af89e02df2d92;hb=refs%2Fheads%2Fmungo_develop;hp=4d182cd4c4766f6166ae670578f274b9d2e1221c;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/ws/seqfetcher/ASequenceFetcher.java b/src/jalview/ws/seqfetcher/ASequenceFetcher.java index 4d182cd..2ed3263 100644 --- a/src/jalview/ws/seqfetcher/ASequenceFetcher.java +++ b/src/jalview/ws/seqfetcher/ASequenceFetcher.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,6 +20,7 @@ */ package jalview.ws.seqfetcher; +import jalview.bin.Cache; import jalview.datamodel.AlignmentI; import jalview.datamodel.DBRefEntry; import jalview.datamodel.SequenceI; @@ -27,10 +28,11 @@ import jalview.util.DBRefUtils; import jalview.util.MessageManager; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Stack; @@ -39,56 +41,93 @@ import java.util.Vector; public class ASequenceFetcher { - /** + /* * set of databases we can retrieve entries from */ - protected Hashtable> FETCHABLEDBS; + protected Hashtable> fetchableDbs; + + /* + * comparator to sort by tier (0/1/2) and name + */ + private Comparator proxyComparator; + /** + * Constructor + */ public ASequenceFetcher() { super(); + + /* + * comparator to sort proxies by tier and name + */ + proxyComparator = new Comparator() + { + @Override + public int compare(DbSourceProxy o1, DbSourceProxy o2) + { + /* + * Tier 0 precedes 1 precedes 2 + */ + int compared = Integer.compare(o1.getTier(), o2.getTier()); + if (compared == 0) + { + // defend against NullPointer - should never happen + String o1Name = o1.getDbName(); + String o2Name = o2.getDbName(); + if (o1Name != null && o2Name != null) + { + compared = o1Name.compareToIgnoreCase(o2Name); + } + } + return compared; + } + }; } /** - * get list of supported Databases + * get array of supported Databases * * @return database source string for each database - only the latest version * of a source db is bound to each source. */ public String[] getSupportedDb() { - if (FETCHABLEDBS == null) - return null; - String[] sf = new String[FETCHABLEDBS.size()]; - Enumeration e = FETCHABLEDBS.keys(); - int i = 0; - while (e.hasMoreElements()) + if (fetchableDbs == null) { - sf[i++] = (String) e.nextElement(); + return null; } - ; + String[] sf = fetchableDbs.keySet().toArray( + new String[fetchableDbs.size()]); return sf; } public boolean isFetchable(String source) { - Enumeration e = FETCHABLEDBS.keys(); - while (e.hasMoreElements()) + for (String db : fetchableDbs.keySet()) { - String db = (String) e.nextElement(); - if (source.compareToIgnoreCase(db) == 0) + if (source.equalsIgnoreCase(db)) + { return true; + } } - jalview.bin.Cache.log.warn("isFetchable doesn't know about '" + source + Cache.log.warn("isFetchable doesn't know about '" + source + "'"); return false; } - public SequenceI[] getSequences(jalview.datamodel.DBRefEntry[] refs) + /** + * Fetch sequences for the given cross-references + * + * @param refs + * @param dna + * if true, only fetch from nucleotide data sources, else peptide + * @return + */ + public SequenceI[] getSequences(DBRefEntry[] refs, boolean dna) { - SequenceI[] ret = null; - Vector rseqs = new Vector(); - Hashtable> queries = new Hashtable(); + Vector rseqs = new Vector(); + Hashtable> queries = new Hashtable>(); for (int r = 0; r < refs.length; r++) { if (!queries.containsKey(refs[r].getSource())) @@ -114,22 +153,22 @@ public class ASequenceFetcher "Don't know how to fetch from this database :" + db)); continue; } - Iterator fetchers = getSourceProxy(db).iterator(); + Stack queriesLeft = new Stack(); - // List queriesFailed = new ArrayList(); queriesLeft.addAll(query); - while (fetchers.hasNext()) + + List proxies = getSourceProxy(db); + for (DbSourceProxy fetcher : proxies) { List queriesMade = new ArrayList(); - HashSet queriesFound = new HashSet(); + HashSet queriesFound = new HashSet(); try { - DbSourceProxy fetcher = fetchers.next(); - boolean doMultiple = fetcher.getAccessionSeparator() != null; // No - // separator - // - no - // Multiple - // Queries + if (fetcher.isDnaCoding() != dna) + { + continue; // wrong sort of data + } + boolean doMultiple = fetcher.getMaximumQueryCount() > 1; while (!queriesLeft.isEmpty()) { StringBuffer qsb = new StringBuffer(); @@ -148,8 +187,7 @@ public class ASequenceFetcher try { // create a fetcher and go to it - seqset = fetcher.getSequenceRecords(qsb.toString()); // , - // queriesFailed); + seqset = fetcher.getSequenceRecords(qsb.toString()); } catch (Exception ex) { System.err.println("Failed to retrieve the following from " @@ -167,7 +205,7 @@ public class ASequenceFetcher { rseqs.addElement(seqs[is]); DBRefEntry[] frefs = DBRefUtils.searchRefs(seqs[is] - .getDBRef(), new DBRefEntry(db, null, null)); + .getDBRefs(), new DBRefEntry(db, null, null)); if (frefs != null) { for (DBRefEntry dbr : frefs) @@ -198,7 +236,9 @@ public class ASequenceFetcher */ System.out.println(hdr); if (rrb != null) + { System.out.println(rrb); + } System.out.println("# end of " + hdr); } @@ -214,24 +254,24 @@ public class ASequenceFetcher { System.out.println("# Adding " + queriesMade.size() + " ids back to queries list for searching again (" + db - + "."); + + ")"); queriesLeft.addAll(queriesMade); } } } + + SequenceI[] result = null; if (rseqs.size() > 0) { - ret = new SequenceI[rseqs.size()]; - Enumeration sqs = rseqs.elements(); + result = new SequenceI[rseqs.size()]; int si = 0; - while (sqs.hasMoreElements()) + for (SequenceI s : rseqs) { - SequenceI s = (SequenceI) sqs.nextElement(); - ret[si++] = s; + result[si++] = s; s.updatePDBIds(); } } - return ret; + return result; } public void reportStdError(String db, List queriesMade, @@ -255,79 +295,56 @@ public class ASequenceFetcher } /** - * Retrieve an instance of the proxy for the given source + * Returns a list of proxies for the given source * * @param db * database source string TODO: add version string/wildcard for * retrieval of specific DB source/version combinations. - * @return an instance of DbSourceProxy for that db. + * @return a list of DbSourceProxy for the db */ public List getSourceProxy(String db) { - List dbs; - Map dblist = FETCHABLEDBS.get(db); + db = DBRefUtils.getCanonicalName(db); + Map dblist = fetchableDbs.get(db); if (dblist == null) { return new ArrayList(); } - ; - if (dblist.size() > 1) - { - DbSourceProxy[] l = dblist.values().toArray(new DbSourceProxy[0]); - int i = 0; - String[] nm = new String[l.length]; - // make sure standard dbs appear first, followed by reference das sources, - // followed by anything else. - for (DbSourceProxy s : l) - { - nm[i++] = "" + s.getTier() + s.getDbName().toLowerCase(); - } - jalview.util.QuickSort.sort(nm, l); - dbs = new ArrayList(); - for (i = l.length - 1; i >= 0; i--) - { - dbs.add(l[i]); - } - } - else - { - dbs = new ArrayList(dblist.values()); - } + + /* + * sort so that primary sources precede secondary + */ + List dbs = new ArrayList(dblist.values()); + Collections.sort(dbs, proxyComparator); return dbs; } /** - * constructs and instance of the proxy and registers it as a valid - * dbrefsource + * constructs an instance of the proxy and registers it as a valid dbrefsource * * @param dbSourceProxy * reference for class implementing * jalview.ws.seqfetcher.DbSourceProxy - * @throws java.lang.IllegalArgumentException - * if class does not implement jalview.ws.seqfetcher.DbSourceProxy */ - protected void addDBRefSourceImpl(Class dbSourceProxy) - throws java.lang.IllegalArgumentException + protected void addDBRefSourceImpl( + Class dbSourceProxy) + throws IllegalArgumentException { DbSourceProxy proxy = null; try { - Object proxyObj = dbSourceProxy.getConstructor(null) - .newInstance(null); - if (!DbSourceProxy.class.isInstance(proxyObj)) - { - throw new IllegalArgumentException( - dbSourceProxy.toString() - + " does not implement the jalview.ws.seqfetcher.DbSourceProxy"); - } - proxy = (DbSourceProxy) proxyObj; + DbSourceProxy proxyObj = dbSourceProxy.getConstructor().newInstance(); + proxy = proxyObj; } catch (IllegalArgumentException e) { throw e; } catch (Exception e) { // Serious problems if this happens. - throw new Error(MessageManager.getString("error.dbrefsource_implementation_exception"), e); + throw new Error( + MessageManager + .getString("error.dbrefsource_implementation_exception"), + e); } addDbRefSourceImpl(proxy); } @@ -342,15 +359,15 @@ public class ASequenceFetcher { if (proxy != null) { - if (FETCHABLEDBS == null) + if (fetchableDbs == null) { - FETCHABLEDBS = new Hashtable>(); + fetchableDbs = new Hashtable>(); } - Map slist = FETCHABLEDBS.get(proxy + Map slist = fetchableDbs.get(proxy .getDbSource()); if (slist == null) { - FETCHABLEDBS.put(proxy.getDbSource(), + fetchableDbs.put(proxy.getDbSource(), slist = new Hashtable()); } slist.put(proxy.getDbName(), proxy); @@ -358,34 +375,6 @@ public class ASequenceFetcher } /** - * test if the database handler for dbName contains the given dbProperty when - * a dbName resolves to a set of proxies - this method will return the result - * of the test for the first instance. TODO implement additional method to - * query all sources for a db to find one with a particular property - * - * @param dbName - * @param dbProperty - * @return true if proxy has the given property - */ - public boolean hasDbSourceProperty(String dbName, String dbProperty) - { - // TODO: decide if invalidDbName exception is thrown here. - - List proxies = getSourceProxy(dbName); - if (proxies != null) - { - for (DbSourceProxy proxy : proxies) - { - if (proxy.getDbSourceProperties() != null) - { - return proxy.getDbSourceProperties().containsKey(dbProperty); - } - } - } - return false; - } - - /** * select sources which are implemented by instances of the given class * * @param class that implements DbSourceProxy @@ -393,21 +382,25 @@ public class ASequenceFetcher */ public String[] getDbInstances(Class class1) { - if (!jalview.ws.seqfetcher.DbSourceProxy.class.isAssignableFrom(class1)) + if (!DbSourceProxy.class.isAssignableFrom(class1)) { - throw new Error(MessageManager.formatMessage("error.implementation_error_dbinstance_must_implement_interface", new String[]{class1.toString()})); + throw new Error( + MessageManager + .formatMessage( + "error.implementation_error_dbinstance_must_implement_interface", + new String[] { class1.toString() })); } - if (FETCHABLEDBS == null) + if (fetchableDbs == null) { return null; } String[] sources = null; - Vector src = new Vector(); - Enumeration dbs = FETCHABLEDBS.keys(); + Vector src = new Vector(); + Enumeration dbs = fetchableDbs.keys(); while (dbs.hasMoreElements()) { - String dbn = (String) dbs.nextElement(); - for (DbSourceProxy dbp : FETCHABLEDBS.get(dbn).values()) + String dbn = dbs.nextElement(); + for (DbSourceProxy dbp : fetchableDbs.get(dbn).values()) { if (class1.isAssignableFrom(dbp.getClass())) { @@ -424,8 +417,9 @@ public class ASequenceFetcher public DbSourceProxy[] getDbSourceProxyInstances(Class class1) { - ArrayList prlist = new ArrayList(); + List prlist = new ArrayList(); for (String fetchable : getSupportedDb()) + { for (DbSourceProxy pr : getSourceProxy(fetchable)) { if (class1.isInstance(pr)) @@ -433,6 +427,7 @@ public class ASequenceFetcher prlist.add(pr); } } + } if (prlist.size() == 0) { return null;