[MOBY-guts] biomoby commit

[Gary Schiltz]

gss
Tue Nov  1 11:28:12 EST 2005
Update of /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets
In directory pub.open-bio.org:/tmp/cvs-serv9543/src/org/semanticmoby/ref/servlets

Modified Files:
	DiscoveryServlet.java KeywordSearchServlet.java 
	ResultsDisplayServlet.java 
Log Message:
Changes to reflect change of name from Service to Resource

s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets DiscoveryServlet.java,1.5,1.6 KeywordSearchServlet.java,1.7,1.8 ResultsDisplayServlet.java,1.4,1.5
===================================================================
RCS file: /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/DiscoveryServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/DiscoveryServlet.java	2005/10/28 04:12:26	1.5
+++ /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/DiscoveryServlet.java	2005/11/01 16:28:12	1.6
@@ -5,8 +5,6 @@
 
 import org.semanticmoby.graph.*;
 
-import org.semanticmoby.parser.*;
-
 import org.semanticmoby.ref.tools.*;
 
 import org.semanticmoby.servlet.*;
@@ -50,9 +48,9 @@
                 ParamReader.getParameter("query-graph", request);
 
             // Parse the query graph into a MOBYGraph object
-            Parser      parser =
+            Parser parser =
                 Parser.forString(graphString, Parser.LANGUAGE_RDF_XML);
-            MOBYService service = parser.parseService();
+            MOBYResource resource = parser.parseResource();
 
             // Find which statements the user wishes to have returned
             String statements =
@@ -66,17 +64,14 @@
             DiscoveryQuery q = null;
 
             if (statements.equalsIgnoreCase("minimal")) {
-
-                q = DiscoveryQuery.newMinimalStmtsQuery(service);
+                q = DiscoveryQuery.newMinimalStmtsQuery(resource);
             } else if (statements.equalsIgnoreCase("query")) {
-
-                q = DiscoveryQuery.newQueryStmtsQuery(service);
+                q = DiscoveryQuery.newQueryStmtsQuery(resource);
             } else {
-
-                q = DiscoveryQuery.newReachableStmtsQuery(service);
+                q = DiscoveryQuery.newReachableStmtsQuery(resource);
             }
 
-            MOBYServiceSet matching = q.findMatchingGraphs();
+            MOBYResourceSet matching = q.findMatchingGraphs();
 
             if ((matching == null) || (matching.size() == 0)) {
 

===================================================================
RCS file: /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java	2005/10/28 04:12:26	1.7
+++ /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java	2005/11/01 16:28:12	1.8
@@ -5,8 +5,6 @@
 
 import org.semanticmoby.graph.*;
 
-import org.semanticmoby.parser.Parser;
-
 import org.semanticmoby.ref.tools.*;
 import org.semanticmoby.ref.tools.db.*;
 import org.semanticmoby.ref.tools.db.DBConnection;
@@ -87,7 +85,7 @@
                     String uri = result.getString(1);
                     row.add(uri);
 
-                    MOBYService resource = resourceAt(uri, model);
+                    MOBYResource resource = resourceAt(uri, model);
                     String      name = resource.getName();
                     row.add(name);
 
@@ -194,7 +192,7 @@
     }
 
 
-    private MOBYService resourceAt(String uri, Model model) {
+    private MOBYResource resourceAt(String uri, Model model) {
 
         Model    resourceModel = ModelFactory.createDefaultModel();
         Resource resource = resourceModel.createResource(uri);
@@ -205,7 +203,7 @@
 
             Parser parser = new Parser(resourceModel);
 
-            return parser.parseService();
+            return parser.parseResource();
         } catch (Throwable t) {
 
             t.printStackTrace();

===================================================================
RCS file: /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/ResultsDisplayServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/ResultsDisplayServlet.java	2005/10/09 01:11:21	1.4
+++ /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/ResultsDisplayServlet.java	2005/11/01 16:28:12	1.5
@@ -1,8 +1,7 @@
 package org.semanticmoby.ref.servlets;
 
-import org.semanticmoby.graph.MOBYService;
-
-import org.semanticmoby.parser.Parser;
+import org.semanticmoby.graph.MOBYResource;
+import org.semanticmoby.graph.Parser;
 
 import org.semanticmoby.ref.tools.*;
 
@@ -26,15 +25,15 @@
             // Read the invocation graph from the MOBY.GRAPH_PARAMETER_NAME
             // parameter and parse it into a MOBYGraph object
             //
-            String           graphString =
+            String graphString =
                 ParamReader.getParameter(MOBY.GRAPH_PARAMETER_NAME, request);
-            Parser           parser =
+            Parser parser =
                 Parser.forString(graphString, Parser.LANGUAGE_RDF_XML);
-            MOBYService      service = parser.parseService();
+            MOBYResource      resource = parser.parseResource();
 
             InvocationBroker broker =
                 new InvocationBroker(this, request, response);
-            broker.buildOutputGUI(service);
+            broker.buildOutputGUI(resource);
         } catch (Throwable t) {
 
             t.printStackTrace();