Changeset 146 for trunk/corelib/src/org/bridgedb/webservice/IDMapperBiomart.java

Timestamp:

08/07/09 10:57:34 (3 years ago)

Author:

martijn

Message:

WIP on improving biomart webservice

Files:

• trunk/corelib/src/org/bridgedb/webservice/IDMapperBiomart.java (modified) (2 diffs)

trunk/corelib/src/org/bridgedb/webservice/IDMapperBiomart.java

@@ -250 +250 @@
      */
     public Map<Xref, Set<Xref>> mapID(Set<Xref> srcXrefs, Set<DataSource> tgtDataSources) throws IDMapperException {
-        if (srcXrefs==null || tgtDataSources==null) {
-            throw new java.lang.IllegalArgumentException("srcXrefs or tgtDataSources cannot be null");
+        if (srcXrefs==null) {
+            throw new java.lang.IllegalArgumentException("srcXrefs cannot be null");
         }
 
@@ -272 +272 @@
         // remove unsupported target datasources
         Set<DataSource> supportedTgtDatasources = cap.getSupportedTgtDataSources();
-        Vector<DataSource> tgtDss = new Vector(tgtDataSources);
-        tgtDss.retainAll(supportedTgtDatasources);
+        Vector<DataSource> tgtDss;
+        if (tgtDataSources == null)
+                tgtDss = new Vector(supportedSrcDatasources);
+        else
+        {
+                tgtDss = new Vector(tgtDataSources);
+                tgtDss.retainAll(supportedTgtDatasources);
+        }
         if (tgtDss.isEmpty()) {
             return result;