Changeset 559 for trunk

Timestamp:

01/08/12 19:53:12 (5 months ago)

Author:

martijn

Message:

Fixed PICR webservice API mismatch glitches

Location:

trunk/org.bridgedb.webservice.picr

Files:

• src/org/bridgedb/webservice/picr/IDMapperPicrRest.java (modified) (3 diffs)
• test/org/bridgedb/webservice/picr/TestRest.java (modified) (1 diff)

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

@@ -136 +136 @@
             final DocumentBuilder builder = factory.newDocumentBuilder();
             final Document doc = builder.parse(is);
-            NodeList nodes = doc.getElementsByTagName("mappedDatabases");
+            NodeList nodes = doc.getElementsByTagName("ns2:mappedDatabases");
             int n = nodes.getLength();
             List<String> dbs = new ArrayList<String>(n);
@@ -272 +272 @@
             doc = builder.parse(is);
 
-            String[] tags = new String[] {"ns2:identicalCrossReferences"
-                        , "ns2:logicalCrossReferences"};
+            String[] tags = new String[] {"identicalCrossReferences"
+                        , "logicalCrossReferences"};
             List<Node> nodes = new ArrayList<Node>();
             for (String tag : tags) {
@@ -290 +290 @@
                 for (int j=0; j<nc; j++) {
                     Node child = children.item(j);
-                    if (child.getNodeName().compareTo("ns2:accession")==0) {
+                    if ("accession".equals(child.getNodeName())) 
+                    {
                         tgtAcc = child.getTextContent();
-                    }  else if (child.getNodeName().compareTo("ns2:databaseName")==0) {
+                    } 
+                    else if ("databaseName".equals(child.getNodeName())) 
+                    {
                         tgtDb = child.getTextContent();
                     }

trunk/org.bridgedb.webservice.picr/test/org/bridgedb/webservice/picr/TestRest.java

@@ -59 +59 @@
                 for (DataSource ds : dslist) System.out.println (ds.getFullName());
 
-                assertTrue(idmap.xrefExists(src1));
+                assertTrue(idmap.xrefExists(src1));
 
                 Set<Xref> srcRefs = new HashSet<Xref>();