[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
In directory pub.open-bio.org:/tmp/cvs-serv17172/src/org/semanticmoby/ref/servlets

Modified Files:
	DiscoveryServlet.java KeywordSearchServlet.java 
	ResultsDisplayServlet.java 
Log Message:
Changed to work after major API overhaul

moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets DiscoveryServlet.java,1.1,1.2 KeywordSearchServlet.java,1.2,1.3 ResultsDisplayServlet.java,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/DiscoveryServlet.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/DiscoveryServlet.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/DiscoveryServlet.java	2005/09/14 22:06:55	1.2
@@ -44,7 +44,7 @@
             // Parse the query graph into a MOBYGraph object
             //
 			Parser parser = Parser.forString(graphString, Parser.LANGUAGE_RDF_XML);
-			MOBYProvider provider = parser.parseProvider();
+			MOBYService service = parser.parseService();
 			
 			// Find which statements the user wishes to have returned
 			//
@@ -59,14 +59,14 @@
             DiscoveryQuery q = null;
             
             if (statements.equalsIgnoreCase("minimal")) {
-            	q = DiscoveryQuery.newMinimalStmtsQuery(provider);
+            	q = DiscoveryQuery.newMinimalStmtsQuery(service);
             } else if (statements.equalsIgnoreCase("query")) {
-            	q = DiscoveryQuery.newQueryStmtsQuery(provider);
+            	q = DiscoveryQuery.newQueryStmtsQuery(service);
             } else {
-            	q = DiscoveryQuery.newReachableStmtsQuery(provider);
+            	q = DiscoveryQuery.newReachableStmtsQuery(service);
             }
             
-			MOBYProviderSet matching = q.findMatchingGraphs();
+			MOBYServiceSet matching = q.findMatchingGraphs();
 			
             if ((matching == null) || (matching.size() == 0))
             {

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java	2005/03/21 21:42:02	1.2
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java	2005/09/14 22:06:55	1.3
@@ -60,7 +60,7 @@
                 {
         			for (Iterator it = matching.iterator(); it.hasNext();)
         			{
-        				MOBYProvider p = (MOBYProvider) it.next();
+        				MOBYService p = (MOBYService) it.next();
         				showProvider(p, out);
         			}
                 }
@@ -171,7 +171,7 @@
 	/**
 	 * Show a provider that matches the keyword search criteria.
 	 */
-	private void showProvider(MOBYProvider provider, PrintStream out)
+	private void showProvider(MOBYService provider, PrintStream out)
 	{
 		String uri = provider.getResource().getURI();
 		String name = provider.getName();

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/ResultsDisplayServlet.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/ResultsDisplayServlet.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/ResultsDisplayServlet.java	2005/09/14 22:06:55	1.2
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.semanticmoby.graph.MOBYProvider;
+import org.semanticmoby.graph.MOBYService;
 import org.semanticmoby.parser.Parser;
 import org.semanticmoby.ref.tools.*;
 import org.semanticmoby.servlet.*;
@@ -27,14 +27,14 @@
 	        		MOBY.GRAPH_PARAMETER_NAME, request);
 	        Parser parser = Parser.forString(
 	               graphString, Parser.LANGUAGE_RDF_XML);
-	        MOBYProvider provider = parser.parseProvider();
+	        MOBYService service = parser.parseService();
 			
 	        response.setContentType("text/html");
 	        startHTML(response, "Semantic MOBY results display", out);
 	        
 	        InvocationBroker broker =
 	        	new InvocationBroker(this, request, response, out);
-	        broker.buildOutputGUI(provider);
+	        broker.buildOutputGUI(service);
 	        finishHTML(out);
 	    }
 	    catch (Throwable t)