[MOBY-guts] biomoby commit

[Gary Schlitz]

gss
Wed May 19 14:26:40 EDT 2004
Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/ref/servlets/dev
In directory pub.open-bio.org:/tmp/cvs-serv634/src/org/smoby/ref/servlets/dev

Modified Files:
	OWLValidationServlet.java ProviderListServlet.java 
	GraphConversionServlet.java MOBYGraphValidationServlet.java 
Log Message:
Incorporation of new parser

moby-live/S-MOBY/ref-impl/server/src/org/smoby/ref/servlets/dev OWLValidationServlet.java,1.1,1.2 ProviderListServlet.java,1.1,1.2 GraphConversionServlet.java,1.1,1.2 MOBYGraphValidationServlet.java,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/ref/servlets/dev/OWLValidationServlet.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/server/src/org/smoby/ref/servlets/dev/OWLValidationServlet.java	2004/03/20 00:36:47	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/ref/servlets/dev/OWLValidationServlet.java	2004/05/19 18:26:40	1.2
@@ -1,7 +1,7 @@
 package org.smoby.ref.servlets.dev;
 
-import org.smoby.tools.server.servlet.ParamReader;
-import org.smoby.tools.server.servlet.ParameterException;
+import org.smoby.servlet.ParamReader;
+import org.smoby.servlet.ParameterException;
 
 import com.hp.hpl.jena.ontology.*;
 import com.hp.hpl.jena.ontology.tidy.*;

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/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/server/src/org/smoby/ref/servlets/dev/ProviderListServlet.java	2004/03/20 00:36:47	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/ref/servlets/dev/ProviderListServlet.java	2004/05/19 18:26:40	1.2
@@ -1,9 +1,9 @@
 package org.smoby.ref.servlets.dev;
 
-import org.smoby.tools.common.*;
+import org.smoby.servlet.*;
+import org.smoby.tools.*;
 import org.smoby.ref.tools.db.*;
 import org.smoby.ref.tools.*;
-import org.smoby.tools.server.servlet.*;
 
 import com.hp.hpl.jena.rdf.model.*;
 import java.io.*;

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/ref/servlets/dev/GraphConversionServlet.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/server/src/org/smoby/ref/servlets/dev/GraphConversionServlet.java	2004/03/20 00:36:47	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/ref/servlets/dev/GraphConversionServlet.java	2004/05/19 18:26:40	1.2
@@ -1,7 +1,7 @@
 package org.smoby.ref.servlets.dev;
 
-import org.smoby.tools.server.servlet.ParamReader;
-import org.smoby.tools.server.servlet.ParameterException;
+import org.smoby.servlet.ParamReader;
+import org.smoby.servlet.ParameterException;
 
 import com.hp.hpl.jena.rdf.model.*;
 

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/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/server/src/org/smoby/ref/servlets/dev/MOBYGraphValidationServlet.java	2004/03/20 00:36:47	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/server/src/org/smoby/ref/servlets/dev/MOBYGraphValidationServlet.java	2004/05/19 18:26:40	1.2
@@ -1,7 +1,8 @@
 package org.smoby.ref.servlets.dev;
 
-import org.smoby.tools.common.graph.*;
-import org.smoby.tools.server.servlet.*;
+import org.smoby.parser.Parser;
+import org.smoby.servlet.*;
+import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.*;
 
@@ -23,18 +24,19 @@
 			Model baseModel = ModelFactory.createDefaultModel();
 			StringReader reader = new StringReader(graphString);
 			baseModel.read(reader, null);
-			new MOBYGraph(baseModel);
+			Parser parser = new Parser(baseModel);
+			parser.parseProvider();
 			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) {}
 	}
 }