[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Fri Jan 26 19:16:04 EST 2007
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier
In directory dev.open-bio.org:/tmp/cvs-serv2405/Java/src/main/org/biomoby/registry/rdfagent/verifier

Modified Files:
	Processor.java Main.java 
Log Message:
when doing findservice, i set the category to ""
moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier Processor.java,1.30,1.31 Main.java,1.19,1.20
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/Processor.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/Processor.java	2006/10/06 17:47:33	1.30
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/Processor.java	2007/01/27 00:16:04	1.31
@@ -328,14 +328,18 @@
 		try {
 			MobyService[] registryServices = new MobyService[] { new MobyService() };
 			// set the signature url to be the url
+			registryServices[0].setCategory("");
 			registryServices[0].setSignatureURL(url);
 			registryServices = central.findService(registryServices[0]);
+			// FIXME search for async and post se
+			
 			if (registryServices == null)
 				throw new MobyException("Findservice call failed.");
 			registryCount = registryServices.length;
 			for (int i = 0; i < registryServices.length; i++) {
 				foundServices.put(registryServices[i].getUniqueName(), registryServices[i]);
 			}
+			
 		} catch (MobyException e) {
 			// 
 			Log.exception(this.getClass().getName(), "processServicesFromURL(String, Central)", e);
@@ -393,6 +397,7 @@
 				Log.info("Unable to find a service in the registry that matches ("
 						+ rdfService.getUniqueName() + ").");
 				MobyService[] ms = new MobyService[] { new MobyService(rdfService.getName()) };
+				ms[0].setCategory("");
 				ms[0].setAuthority(rdfService.getAuthority());
 
 				try {
@@ -759,9 +764,12 @@
 			processCentralAdminCode(code);
 			if (service.getEmailContact().trim().equals("")) {
 				try {
-					MobyService[] services = central.findService(new MobyService(service.getName()));
+					MobyService __template__ = new MobyService(service.getName());
+					__template__.setCategory("");
+					MobyService[] services = central.findService(__template__);
 					if (services == null  || services.length  < 1) {
 						MobyService temp = new MobyService();
+						temp.setCategory("");
 						temp.setAuthority(service.getAuthority());
 						services = central.findService(temp);
 						if (services == null  || services.length  < 1) {
@@ -794,9 +802,12 @@
 		} else {
 			if (service.getEmailContact().trim().equals("")) {
 				try {
-					MobyService[] services = central.findService(new MobyService(service.getName()));
+					MobyService __template__ = new MobyService(service.getName());
+					__template__.setCategory("");
+					MobyService[] services = central.findService(__template__);
 					if (services == null  || services.length  < 1) {
 						MobyService temp = new MobyService();
+						temp.setCategory("");
 						temp.setAuthority(service.getAuthority());
 						services = central.findService(temp);
 						if (services == null  || services.length  < 1) {

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/Main.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/Main.java	2006/10/04 18:43:53	1.19
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/Main.java	2007/01/27 00:16:04	1.20
@@ -219,7 +219,10 @@
 		MobyService[] services = null;
 		try {
 			Log.info("Getting all services from the registry. Will take some time.");
-			services = central.findService(new MobyService());
+			MobyService __template__ = new MobyService();
+			__template__.setCategory("");
+			services = central.findService(__template__);
+			__template__ = null;
 			Log.info("Successfully retrieved all services from the registry.");
 		} catch (MobyException e) {
 			Log.exception("org.registry.rdfagent.verifier.Main", "processRegistry()", e.getCause());