[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Fri Dec  7 15:22:49 EST 2007
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services
In directory dev.open-bio.org:/tmp/cvs-serv2074/src/main/ca/ucalgary/seahawk/services

Modified Files:
	MobyClient.java 
Log Message:
Removed commented-out code, changed 'alive' URL to reflect new default MOBY Central
moby-live/Java/src/main/ca/ucalgary/seahawk/services MobyClient.java,1.16,1.17
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java	2007/07/28 03:46:16	1.16
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java	2007/12/07 20:22:49	1.17
@@ -63,7 +63,7 @@
     public static final String ENCODING_ATTR_BASE64_VAL = "Base64";
     public static final String ENCODING_ATTR_NONE_VAL = "none";
     public static final String SINGLE_RETURNED_VALUE_KEY = "_no_acd_param_should_have_this_name";
-    public static final String IS_ALIVE_SERVICE_URL = "http://mobycentral.icapture.ubc.ca:8090/authority/ValidateService";
+    public static final String IS_ALIVE_SERVICE_URL = "http://moby.ucalgary.ca/moby/ValidateService";
 
     private NamespaceContextImpl nsContext;
     private CentralImpl c;
@@ -1022,15 +1022,11 @@
 	    // Let's make sure all of the services have their service type properly instantiated
 	    // for ontology checks later on
 	    for(int j = 0; j < mService.length; j++){
- 		// Paul: commenting out is temporary until we can fetch the services more quickly
-		//MobyService service = MobyService.getService(mService[j].getName(), mService[j].getAuthority());
- 		//if(service != null){
-		//    mService[j] = service;
- 		//}
-
 		mService[j].setStatus(MobyService.ALIVE, isServiceAlive(mService[j]));
 		mService[j].setServiceType(MobyServiceType.getServiceType(mService[j].getServiceType().getName(), 
 		                                                          SeahawkOptions.getRegistry()));
+		//System.err.println("Service type is "+mService[j].getServiceType()+" registry="+SeahawkOptions.getRegistry());
+		//System.err.println(mService[j].getServiceType().getParent());
 		if(serviceLevel != MobyService.UNCHECKED){
 		    int serviceStatus = mService[j].getStatus();
 		    //System.err.println("Service " + mService[j].getName() + " has status " + serviceStatus);
@@ -1040,7 +1036,6 @@
 		}
 	    }
 
-	    // Paul: false is temporary until we can fetch the services more quickly (and check isAlive)
 	    if(serviceLevel != MobyService.UNCHECKED){
 		mService = (MobyService []) filteredServices.toArray(new MobyService[filteredServices.size()]);
 	    }
@@ -1457,6 +1452,8 @@
 	if(isDeadMap == null){
 	    isDeadMap = new HashMap(); // keys are authority:serviceName
 	    try{
+		// Note, since it's not part of the standard API, this only 
+		// works for services listed in the default Central
 		URL u = new URL(IS_ALIVE_SERVICE_URL);
 		LineNumberReader reader = new LineNumberReader(new InputStreamReader(u.openStream()));
 		String currentAuthority = null;