Author: rodche
Date: 2011-11-23 17:48:23 -0800 (Wed, 23 Nov 2011)
New Revision: 27602

Modified:
   
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/CPathWebServiceImpl.java
   
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/view/SelectPhysicalEntity.java
Log:
Mainly, a bug (search w/o organism filter) - fixed.

Modified: 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/CPathWebServiceImpl.java
===================================================================
--- 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/CPathWebServiceImpl.java
 2011-11-24 01:24:39 UTC (rev 27601)
+++ 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/CPathWebServiceImpl.java
 2011-11-24 01:48:23 UTC (rev 27602)
@@ -65,8 +65,8 @@
        if(LOGGER.isDebugEnabled())
                LOGGER.debug("cPath2Url=" + client.getEndPointURL());
        
-        
client.setOrganisms(Collections.singleton(String.valueOf(ncbiTaxonomyId)));
-        //protocol.setCommand(CPathProtocol.COMMAND_SEARCH);
+        if(ncbiTaxonomyId > 0)
+               
client.setOrganisms(Collections.singleton(String.valueOf(ncbiTaxonomyId)));
         client.setType("PhysicalEntity");
 
         try {

Modified: 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/view/SelectPhysicalEntity.java
===================================================================
--- 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/view/SelectPhysicalEntity.java
   2011-11-24 01:24:39 UTC (rev 27601)
+++ 
csplugins/trunk/toronto/rodche/cpathsquared-impl/src/main/java/org/cytoscape/cpathsquared/internal/view/SelectPhysicalEntity.java
   2011-11-24 01:48:23 UTC (rev 27602)
@@ -50,6 +50,9 @@
 
             html.append ("<h2>" + searchHit.getName() + "</h2>");
             html.append ("<h3>Class: " + searchHit.getBiopaxClass() + "</h3>");
+            html.append ("<h3>URI: " + searchHit.getUri() + "</h3>");
+            if(searchHit.getActualHitUri() != null)
+               html.append ("<h3>Child (actual) hit URI: " + 
searchHit.getActualHitUri() + "</h3>");
 
             List<String> items = searchHit.getOrganism();
             if (items != null && !items.isEmpty()) {

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to