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

Modified Files:
	StorageManager.java DBConnection.java 
Log Message:
Changes to reflect change of name from Service to Resource

s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db StorageManager.java,1.6,1.7 DBConnection.java,1.1,1.2
===================================================================
RCS file: /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java	2005/10/28 04:12:27	1.6
+++ /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java	2005/11/01 16:28:12	1.7
@@ -60,16 +60,16 @@
      * are in the resource graph's namespace will be stored in the global repository,
      * and all statements from the resource graph are stored in a separate model
      * that has as its name the fully expanded URI of the resource.
-     * @param service the resource to store
+     * @param resource the resource to store
      * @param lastModifiedDate when the graph was last modified
      * @throws StorageException if unable to access the database
      */
-    public void registerResource(MOBYService service, Date lastModifiedDate)
+    public void registerResource(MOBYResource resource, Date lastModifiedDate)
                           throws StorageException {
 
-        Model    model     = service.getJenaModel();
+        Model    model     = resource.getJenaModel();
         Model    dbModel   = null;
-        String   uriString = service.getResource().getURI();
+        String   uriString = resource.getResource().getURI();
         Resource uri       = model.createResource(uriString);
 
         try {
@@ -119,8 +119,8 @@
 
             // Add keywords associated with the resource
             //
-            KeywordFinder finder = new KeywordFinder(service);
-            addKeywords(service.getResource().getURI(), finder.getKeywords(),
+            KeywordFinder finder = new KeywordFinder(resource);
+            addKeywords(resource.getResource().getURI(), finder.getKeywords(),
                         dbModel);
 
             // Commit the transaction on the database model
@@ -154,7 +154,7 @@
 
             java.sql.Statement sql = conn.createStatement();
 
-            doAddKeywords(resourceURI, list.getServiceKeywords(), "P", sql);
+            doAddKeywords(resourceURI, list.getResourceKeywords(), "P", sql);
             doAddKeywords(resourceURI, list.getSubjectKeywords(), "S", sql);
             doAddKeywords(resourceURI, list.getObjectKeywords(), "O", sql);
         } catch (Throwable t) {

===================================================================
RCS file: /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/DBConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/DBConnection.java	2005/10/09 01:11:22	1.1
+++ /home/repository/moby/s-moby/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/DBConnection.java	2005/11/01 16:28:12	1.2
@@ -57,17 +57,11 @@
      * for this application.
      */
     public DBConnection() {
-
-        this.propsFileName     = propsFileName;
-        this.logFileName       = logFileName;
-
         try {
-
             startLog();
             loadDBProperties();
             connect();
         } catch (Exception e) {
-
             System.err.println();
             e.printStackTrace();
         }