[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue May 31 14:09:24 EDT 2005
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources
In directory pub.open-bio.org:/tmp/cvs-serv6268/org/biomoby/client/ui/graphical/servlet/jresources

Modified Files:
	RESOURCE.java 
Log Message:
updated the 'script' to use updated properties. Eddie

moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.4,1.5
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java	2005/05/13 19:18:18	1.4
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java	2005/05/31 18:09:24	1.5
@@ -17,7 +17,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.biomoby.client.CentralDigestImpl;
-import org.biomoby.client.CentralImpl;
 import org.biomoby.client.rdf.vocabulary.MobyResources;
 import org.biomoby.client.rdf.vocabulary.Predicates;
 import org.biomoby.registry.definitions.types.JNamespaces;
@@ -26,14 +25,12 @@
 import org.biomoby.registry.properties.MobyProperties;
 import org.biomoby.shared.CentralDigest;
 import org.biomoby.shared.MobyData;
-import org.biomoby.shared.MobyDataType;
 import org.biomoby.shared.MobyException;
 import org.biomoby.shared.MobyNamespace;
 import org.biomoby.shared.MobyPrimaryDataSet;
 import org.biomoby.shared.MobyPrimaryDataSimple;
 import org.biomoby.shared.MobySecondaryData;
 import org.biomoby.shared.MobyService;
-import org.biomoby.shared.NoSuccessException;
 import org.biomoby.shared.data.MobyDataSecondaryInstance;
 import org.w3c.rdf.model.ModelException;
 
@@ -143,21 +140,21 @@
     private static Properties properties = MobyProperties.PROPERTIES();;
 
     private static final String OBJ = "http://"
-            + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Objects#";
+            + properties.getProperty("resources_script_domain")  + "/RESOURCES/MOBY-S/Objects#";
 
     private static final String SRV = "http://"
-            + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Services#";
+            + properties.getProperty("resources_script_domain")  + "/RESOURCES/MOBY-S/Services#";
 
     private static final String NS = "http://"
-            + properties.getProperty("domain")
+            + properties.getProperty("resources_script_domain") 
             + "/RESOURCES/MOBY-S/Namespaces#";
 
     private static final String MP = "http://"
-            + properties.getProperty("domain")
+            + properties.getProperty("resources_script_domain") 
             + "/RESOURCES/MOBY-S/Predicates#";
 
     private static final String SI = "http://"
-            + properties.getProperty("domain")
+            + properties.getProperty("resources_script_domain") 
             + "/RESOURCES/MOBY-S/ServiceInstances#";
 
     private static boolean RUN_MAIN = false;
@@ -686,15 +683,7 @@
                 obj = obj.substring(0, obj.indexOf("("));
 
             Resource _subject = _addClassResource(model, OBJ, sub, def);
-            try {
-                //TODO make this an sql call
-                MobyDataType _datatype = new CentralImpl().getDataType(sub);
-                model.add(model.createStatement(subject, DC.publisher, model.createLiteral(_datatype.getAuthority(), "en")));
-                model.add(model.createStatement(subject, DC.creator, model.createLiteral( _datatype.getEmailContact(), "en")));
-            } catch (NoSuccessException e) {
-                // oh well, at least we tried
-                System.err.println(sub + " could not be augmented with its 'creator' or its 'publisher'. Oh well, at least we tried");
-            }
+            
             m = Pattern.compile(".*:isa$", Pattern.CASE_INSENSITIVE).matcher(
                     pred);
             if (m.matches()) {