[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Mar 21 12:23:43 EDT 2007
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services
In directory dev.open-bio.org:/tmp/cvs-serv15739/src/main/ca/ucalgary/seahawk/services

Modified Files:
	MobyClient.java 
Log Message:
Fixed logic for loading rule file
moby-live/Java/src/main/ca/ucalgary/seahawk/services MobyClient.java,1.6,1.7
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java	2007/03/12 14:37:24	1.6
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/services/MobyClient.java	2007/03/21 16:23:43	1.7
@@ -95,14 +95,15 @@
         if(rulesResource == null){
 	  dataMappingXMLURL = cl.getResource(DATA_MAPPING_XML_RESOURCE);
         }
-	
-	// See if it's a URL
-	try{
-	    dataMappingXMLURL = new URL(rulesResource);
+	else{
+	    // See if it's a URL
+	    try{
+		dataMappingXMLURL = new URL(rulesResource);
+	    }
+	    catch(Exception e){
+		dataMappingXMLURL = cl.getResource(rulesResource);
+	    }
 	}
-        catch(Exception e){
-          dataMappingXMLURL = cl.getResource(rulesResource);
-        }
 	if(dataMappingXMLURL == null){
 	    System.err.println("Could not find MOBY data mapping resource '"+
 			       rulesResource+"'");