[MOBY-guts] biomoby commit

[Gary Schiltz]

gss
Wed Sep 14 18:06:55 EDT 2005
Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/dev
In directory pub.open-bio.org:/tmp/cvs-serv17172/src/org/semanticmoby/ref/servlets/dev

Modified Files:
	MOBYGraphValidationServlet.java ProviderListServlet.java 
Log Message:
Changed to work after major API overhaul

moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/dev MOBYGraphValidationServlet.java,1.1,1.2 ProviderListServlet.java,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/dev/MOBYGraphValidationServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/dev/MOBYGraphValidationServlet.java	2004/11/22 22:58:40	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/dev/MOBYGraphValidationServlet.java	2005/09/14 22:06:55	1.2
@@ -1,6 +1,7 @@
 package org.semanticmoby.ref.servlets.dev;
 
 import org.semanticmoby.graph.*;
+import org.semanticmoby.parser.NonCanonicalException;
 import org.semanticmoby.parser.Parser;
 import org.semanticmoby.ref.servlets.BaseServlet;
 import org.semanticmoby.servlet.*;
@@ -28,18 +29,18 @@
 			StringReader reader = new StringReader(graphString);
 			baseModel.read(reader, null);
 			Parser parser = new Parser(baseModel);
-			parser.parseProvider();
+			parser.parseService();
 			out.println("Model is canonical");
 		}
         catch (ParameterException e)
         {
             response.sendError(HttpServletResponse.SC_NOT_ACCEPTABLE, e.getMessage());
         }
-//		catch (NonCanonicalException e)
-//		{
-//			out.println("Model failed canonicality test:");
-//			out.println(e);
-//		}
+		catch (NonCanonicalException e)
+		{
+			out.println("Model failed canonicality test:");
+			out.println(e);
+		}
 		catch (IllegalArgumentException e) {}
 	}
 }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/dev/ProviderListServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/dev/ProviderListServlet.java	2004/11/22 22:58:40	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/dev/ProviderListServlet.java	2005/09/14 22:06:55	1.2
@@ -23,7 +23,7 @@
         	Model dbModel = manager.openDBModel();
             int count = 0;
             StmtIterator it = dbModel.listStatements(
-            	null, RDF.type, MOBY.Provider);
+            	null, RDF.type, MOBY.Service);
             
             while (it.hasNext()) {
             	Statement stmt = it.nextStatement();