Menu
▾
▴
[Cdk-commits] SF.net SVN: cdk:[14109] cdk-xws/trunk/xws-rdf-services/src/org/openscience/ cdk/xws
|
From: <eg...@us...> - 2009-02-07 16:03:06
|
Revision: 14109
http://cdk.svn.sourceforge.net/cdk/?rev=14109&view=rev
Author: egonw
Date: 2009-02-07 16:02:51 +0000 (Sat, 07 Feb 2009)
Log Message:
-----------
Take rdf:Description as input, any RDF as output
Modified Paths:
--------------
cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/services/RONBridge.java
Added Paths:
-----------
cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdfDescription.xml
cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdfRDF.xml
Removed Paths:
-------------
cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdf.xml
Deleted: cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdf.xml
===================================================================
--- cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdf.xml 2009-02-07 16:02:14 UTC (rev 14108)
+++ cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdf.xml 2009-02-07 16:02:51 UTC (rev 14109)
@@ -1,12 +0,0 @@
-<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
- targetNamespace='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
- xmlns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
- xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
- elementFormDefault='qualified'>
- <xs:element name="Description">
- <xs:complexType>
- <xs:attribute name="about" type="xs:anyURI"/>
- <xs:anyAttribute/>
- </xs:complexType>
- </xs:element>
-</xs:schema>
\ No newline at end of file
Copied: cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdfDescription.xml (from rev 14108, cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdf.xml)
===================================================================
--- cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdfDescription.xml (rev 0)
+++ cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdfDescription.xml 2009-02-07 16:02:51 UTC (rev 14109)
@@ -0,0 +1,12 @@
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
+ targetNamespace='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ xmlns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ elementFormDefault='qualified'>
+ <xs:element name="Description">
+ <xs:complexType>
+ <xs:attribute name="about" type="xs:anyURI"/>
+ <xs:anyAttribute/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
Copied: cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdfRDF.xml (from rev 14108, cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdf.xml)
===================================================================
--- cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdfRDF.xml (rev 0)
+++ cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/schema/rdfRDF.xml 2009-02-07 16:02:51 UTC (rev 14109)
@@ -0,0 +1,14 @@
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
+ targetNamespace='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ xmlns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ elementFormDefault='qualified'>
+ <xs:element name="RDF">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:any namespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/>
+ </xs:sequence>
+ <xs:anyAttribute/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
Modified: cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/services/RONBridge.java
===================================================================
--- cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/services/RONBridge.java 2009-02-07 16:02:14 UTC (rev 14108)
+++ cdk-xws/trunk/xws-rdf-services/src/org/openscience/cdk/xws/services/RONBridge.java 2009-02-07 16:02:51 UTC (rev 14109)
@@ -41,8 +41,10 @@
private final static String FUNCTION_DESCRIPTION = "Retrieves information on the given molecule.";
private final static String FUNCTION_DETAILS = "Returns information in RDF format.";
- private final static String SCHEMATA =
- ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/rdf.xml");
+ private final static String IN_SCHEMATA =
+ ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/rdfDescription.xml");
+ private final static String OUT_SCHEMATA =
+ ResourceAsStringTool.getAsString("org/openscience/cdk/xws/schema/rdfRDF.xml");
private static final String NS_RDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
@@ -52,8 +54,8 @@
FUNCTION_NAME,
FUNCTION_DESCRIPTION,
FUNCTION_DETAILS,
- SCHEMATA, // RDF in
- SCHEMATA, // RDF out
+ IN_SCHEMATA,
+ OUT_SCHEMATA,
false
);
@@ -64,7 +66,7 @@
Element output = null;
if (NS_RDF.equals(input.getNamespaceURI()) &&
"Description".equals(input.getLocalName())) {
- String resource = input.getAttributeNS(NS_RDF, "Description");
+ String resource = input.getAttribute("about");
if (resource != null &&
resource.startsWith("http://rdf.openmolecules.net/?InChI=1/")) {
System.out.println("resource: " + resource);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|