[MOBY-guts] biomoby commit

[senger@ebi.ac.uk]

senger
Tue May 18 06:13:17 EDT 2004
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client
In directory pub.open-bio.org:/tmp/cvs-serv26265/src/main/org/biomoby/client

Modified Files:
	CentralImpl.java 
Log Message:
improved finding services in MobyCmdLineClient

moby-live/Java/src/main/org/biomoby/client CentralImpl.java,1.12,1.13
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java	2004/04/21 17:22:26	1.12
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java	2004/05/18 10:13:17	1.13
@@ -1140,12 +1140,42 @@
      *************************************************************************/
     public MobyService[] findService (MobyService pattern, String[] keywords)
 	throws MobyException {
+	return findService (pattern, keywords, true, true);
+// 	if (pattern == null)
+// 	    pattern = new MobyService ("dummy");
+
+// 	String[] query = new String[] { 
+// 				"<findService>" +
+// 				buildQueryObject (pattern, keywords, true, true, false) + 
+// 				"</findService>"
+// 	};
+// 	if(useCache && cache.containsKey("findService"+query[0]))
+// 	    return (MobyService[]) cache.get("findService"+query[0]);
+	
+// 	String result = (String) doCall ("findService", query);
+// 	MobyService[] services = extractServices (result);
+
+// 	if(useCache)
+// 	    cache.put("findService"+query[0], services);
+// 	return services;
+    }
+
+    /**************************************************************************
+     *
+     *************************************************************************/
+    public MobyService[] findService (MobyService pattern, String[] keywords,
+				      boolean includeChildrenServiceTypes,
+				      boolean includeParentDataTypes)
+	throws MobyException {
 	if (pattern == null)
 	    pattern = new MobyService ("dummy");
 
 	String[] query = new String[] { 
 				"<findService>" +
-				buildQueryObject (pattern, keywords, true, true, false) + 
+				buildQueryObject (pattern, keywords,
+						  includeParentDataTypes,
+						  includeChildrenServiceTypes,
+						  false) + 
 				"</findService>"
 	};
 	if(useCache && cache.containsKey("findService"+query[0]))