Changeset 252

Timestamp:

11/06/09 10:45:33 (2 years ago)

Author:

martijn

Message:

Made Picr and PicrRest? comply with basic unit tests

Location:

trunk/picr/src/org/bridgedb/webservice/picr

Files:

• IDMapperPicr.java (modified) (5 diffs)
• IDMapperPicrRest.java (modified) (2 diffs)

trunk/picr/src/org/bridgedb/webservice/picr/IDMapperPicr.java

@@ -151 +151 @@
         {               
                 Object[] databases;
-                if (tgtDataSources == null) 
+                if (tgtDataSources.length == 0) 
                         databases = supportedDbObjects;
                 else
@@ -158 +158 @@
                 Set<Xref> result = new HashSet<Xref>();
                 if (databases.length == 0) return result;
-                
+                if (!supportedDatabases.contains(srcXref.getDataSource())) return result;
+
                 List<CrossReference> refs = new ArrayList<CrossReference>();
                 
@@ -187 +188 @@
                 for (DataSource tgt : ds)
                 {
-                        if (supportedDatabases.contains(ds))
+                        if (supportedDatabases.contains(tgt))
                                 databases.add(tgt.getFullName());
                 }
@@ -210 +211 @@
                         throws IDMapperException 
         {
+                Set<String> result = new HashSet<String>();
+                if (!supportedDatabases.contains(ref.getDataSource())) return result;
+                
                 List<UPEntry> entries = client.performAccessionMapping(ref.getId(), supportedDbObjects);
-                
-                Set<String> result = new HashSet<String>();
-                
                 for (UPEntry entry : entries)
                 {
@@ -249 +250 @@
                         throws IDMapperException 
         {
+                Map<String, Set<String>> result = new HashMap<String, Set<String>>();
+                if (!supportedDatabases.contains(ref.getDataSource())) return result;
+
                 List<UPEntry> entries = client.performAccessionMapping(ref.getId(), supportedDbObjects);
-                
-                Map<String, Set<String>> result = new HashMap<String, Set<String>>();
-                
                 for (UPEntry entry : entries)
                 {                       

trunk/picr/src/org/bridgedb/webservice/picr/IDMapperPicrRest.java

@@ -111 +111 @@
                                 isOnlyActive = Boolean.parseBoolean(args.get("only-active"));
                         }
-                        return new IDMapperPicr(isOnlyActive);
+                        return new IDMapperPicrRest(isOnlyActive);
                 }
         }
@@ -190 +190 @@
             // remove unsupported data sources
             Set<String> tgtDss = new HashSet<String>();
-            if (tgtDataSources!=null) {
+            if (tgtDataSources.length > 0) {
                 for (DataSource ds : tgtDataSources) {
                     if (supportedDatabases.contains(ds)) {