[Volute] r3507 - in trunk/projects/dm/vo-dml: doc doc/samples/votable mapping xsd

Volute commit messages volutecommits at g-vo.org
Wed Oct 26 18:05:32 CEST 2016


Author: gerard.lemson
Date: Thu Aug 18 13:40:58 2016
New Revision: 3507

Log:
updates to docs and test votables (in mapping)

Added:
   trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml
   trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml.vo-dml.xml
   trunk/projects/dm/vo-dml/mapping/test2.votable.xml.vo-dml.xml
   trunk/projects/dm/vo-dml/mapping/test3.votable.xml.vo-dml.xml
Modified:
   trunk/projects/dm/vo-dml/doc/MappingDMtoVOTable-v1.0-201607xx.docx
   trunk/projects/dm/vo-dml/doc/VO-DML-WD-v1.0.docx
   trunk/projects/dm/vo-dml/doc/samples/votable/VOTable-1.3_vodml.xsd
   trunk/projects/dm/vo-dml/mapping/test3.votable.xml
   trunk/projects/dm/vo-dml/xsd/vo-dml-instance.xsd

Modified: trunk/projects/dm/vo-dml/doc/MappingDMtoVOTable-v1.0-201607xx.docx
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/vo-dml/doc/VO-DML-WD-v1.0.docx
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/vo-dml/doc/samples/votable/VOTable-1.3_vodml.xsd
==============================================================================
--- trunk/projects/dm/vo-dml/doc/samples/votable/VOTable-1.3_vodml.xsd	Thu Aug 18 10:37:06 2016	(r3506)
+++ trunk/projects/dm/vo-dml/doc/samples/votable/VOTable-1.3_vodml.xsd	Thu Aug 18 13:40:58 2016	(r3507)
@@ -620,19 +620,19 @@
  -->
 	<xs:complexType name="VODMLAnnotation">
 		<xs:sequence>
-			<xs:element name="TYPE" type="VODMLReference" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="ROLE" type="VODMLReference" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>
-						MUST reference the exact VO-DML type of the instance represented by the container of the annotation element.
-						Q: should we make minOccurs="1"?
+						MUST be provided on annotations of FIELDref and PARAMref and, if contained in a VO-DML annotated GROUP or PARAM.
+						If not provided on a root GROUP, indicates that it represents a stand-alone object.
 					</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="ROLE" type="VODMLReference" minOccurs="0">
+			<xs:element name="TYPE" type="VODMLReference" minOccurs="0" maxOccurs="unbounded">
 				<xs:annotation>
 					<xs:documentation>
-						MUST be provided on annotations of FIELDref and PARAMref and, if contained in a VO-DML annotated GROUP or PARAM.
-						If not provided on a root GROUP, indicates that it represents a stand-alone object.
+						MUST reference the exact VO-DML type of the instance represented by the container of the annotation element.
+						Q: should we make minOccurs="1"?
 					</xs:documentation>
 				</xs:annotation>
 			</xs:element>

Added: trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml	Thu Aug 18 13:40:58 2016	(r3507)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  
+Test for vodml-map:Model.
+Version of test1 with errors:
+a parameter is introduced that does not exist (description)
+ -->
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3_vodml">
+<!-- 
+Declaration of VO-DML modes that are used in this annotated VOTable.
+See $7.1.
+-->
+	<GROUP>
+		<VODML><TYPE>vodml-map:Model</TYPE></VODML>
+		<PARAM name="url" datatype="char" arraysize="*"
+			value="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml">
+			<VODML><ROLE>vodml-map:Model.url</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
+		</PARAM>
+		<PARAM name="name" datatype="char" arraysize="*" value="vodml-map">
+			<VODML><ROLE>vodml-map:Model.name</ROLE><TYPE>ivoa:string</TYPE></VODML>
+		</PARAM>
+		<!-- the following annotation is an error as the vodmlref does not refer to an existing vo-dml element -->
+		<PARAM name="descr" datatype="char" arraysize="*" value="vodml-map is the model defining annotations for special annotations">
+			<VODML><ROLE>vodml-map:Model.description</ROLE><TYPE>ivoa:string</TYPE></VODML>
+		</PARAM>
+	</GROUP>
+	
+	<GROUP>
+		<VODML><TYPE>vodml-map:Model</TYPE></VODML>
+		
+		<PARAM name="name" datatype="char" arraysize="*" value="ivoa">
+			<VODML><ROLE>vodml-map:Model.name</ROLE><TYPE>ivoa:string</TYPE></VODML>
+		</PARAM>
+		
+		<PARAM name="url" datatype="char" arraysize="*"
+			value="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml">
+			<VODML><ROLE>vodml-map:Model.url</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
+		</PARAM>
+		<!-- Here an existing vo-dmlid is used in the wrong location. This vodmlref identifies a type, not  role-->
+		<PARAM name="typo" datatype="char" arraysize="*" value="model">
+			<VODML><ROLE>vodml-map:Model</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
+		</PARAM>
+
+	</GROUP>
+	
+	<GROUP>
+		<VODML><TYPE>vodml-map:Model</TYPE></VODML>
+		<PARAM name="url" datatype="char" arraysize="*"
+			value="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/photdm-alt/PhotDM-alt.vo-dml.xml">
+			<VODML><ROLE>vodml-map:Model.url</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
+		</PARAM>
+		
+		<PARAM name="identifier" datatype="char" arraysize="*"
+			value="ivo://ivoa.org/dm/PhotDM-alt/1.9">
+			<VODML><ROLE>vodml-map:Model.identifier</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
+		</PARAM>
+		
+		<PARAM name="name" datatype="char" arraysize="*" value="photdm-alt">
+			<VODML><ROLE>vodml-map:Model.name</ROLE><TYPE>ivoa:string</TYPE></VODML>
+		</PARAM>
+		<!-- Here an existing vodml-id identifying  Role is used in the wrong location. -->
+		<PARAM name="typo" datatype="char" arraysize="*" value="model">
+			<VODML><ROLE>vodml-map:Collection.item</ROLE><TYPE>vodml-map:Reference</TYPE></VODML>
+		</PARAM>
+
+		
+	</GROUP>
+	
+	<RESOURCE/>
+	
+	
+</VOTABLE>

Added: trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml.vo-dml.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml.vo-dml.xml	Thu Aug 18 13:40:58 2016	(r3507)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vodmli:instance xmlns:vodmli="http://volute.googlecode.com/dm/vo-dml-instance/v0.x">
+<model><vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</vodmlURL><utypePrefix>ivoa</utypePrefix></model>
+<model><vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml</vodmlURL><utypePrefix>vodml-map</utypePrefix></model>
+<model><vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/photdm-alt/PhotDM-alt.vo-dml.xml</vodmlURL><utypePrefix>photdm-alt</utypePrefix></model>
+</vodmli:instance>

Added: trunk/projects/dm/vo-dml/mapping/test2.votable.xml.vo-dml.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/vo-dml/mapping/test2.votable.xml.vo-dml.xml	Thu Aug 18 13:40:58 2016	(r3507)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vodmli:instance xmlns:vodmli="http://volute.googlecode.com/dm/vo-dml-instance/v0.x">
+<model><vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</vodmlURL><utypePrefix>ivoa</utypePrefix></model>
+<model><vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml</vodmlURL><utypePrefix>vodml-map</utypePrefix></model>
+<model><vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/photdm-alt/PhotDM-alt.vo-dml.xml</vodmlURL><utypePrefix>photdm-alt</utypePrefix></model>
+<!-- +++++++++ START GROUP[rank=13|vodmlref=(role=|type=photdm-alt:PhotometryFilter):id=_2massJ]: -->
+<object utype="photdm-alt:PhotometryFilter">
+<identifier>
+<transientID>-1</transientID>
+<altID><field>_2massJ</field>
+<source>GROUP/@ID</source></altID>
+</identifier>
+<attribute vodmlRef="photdm-alt:PhotometryFilter.name" name="name"><primitiveValue utype="ivoa:string">J</primitiveValue></attribute>
+<attribute vodmlRef="photdm-alt:PhotometryFilter.bandName" name="bandName"><primitiveValue utype="ivoa:string">2mass:J</primitiveValue></attribute>
+<attribute vodmlRef="photdm-alt:PhotometryFilter.spectralLocation" name="spectralLocation">
+<dataObject utype="ivoa:quantity.RealQuantity"><attribute vodmlRef="ivoa:quantity.Quantity.unit" name="unit"><primitiveValue utype="ivoa:quantity.Unit">nm</primitiveValue></attribute>
+<attribute vodmlRef="ivoa:quantity.RealQuantity.value" name="value"><primitiveValue utype="ivoa:real">1235.0</primitiveValue></attribute>
+</dataObject></attribute>
+</object>
+<!-- +++++++++   END GROUP[rank=13|vodmlref=(role=|type=photdm-alt:PhotometryFilter):id=_2massJ] -->
+<!-- +++++++++ START GROUP[rank=17|vodmlref=(role=|type=photdm-alt:PhotometryFilter):id=_2massH]: -->
+<object utype="photdm-alt:PhotometryFilter">
+<identifier>
+<transientID>-2</transientID>
+<altID><field>_2massH</field>
+<source>GROUP/@ID</source></altID>
+</identifier>
+<attribute vodmlRef="photdm-alt:PhotometryFilter.name" name="name"><primitiveValue utype="ivoa:string">H</primitiveValue></attribute>
+<attribute vodmlRef="photdm-alt:PhotometryFilter.bandName" name="bandName"><primitiveValue utype="ivoa:string">2mass:H</primitiveValue></attribute>
+<attribute vodmlRef="photdm-alt:PhotometryFilter.spectralLocation" name="spectralLocation">
+<dataObject utype="ivoa:quantity.RealQuantity"><attribute vodmlRef="ivoa:quantity.Quantity.unit" name="unit"><primitiveValue utype="ivoa:quantity.Unit">nm</primitiveValue></attribute>
+<attribute vodmlRef="ivoa:quantity.RealQuantity.value" name="value"><primitiveValue utype="ivoa:real">1662.0</primitiveValue></attribute>
+</dataObject></attribute>
+</object>
+<!-- +++++++++   END GROUP[rank=17|vodmlref=(role=|type=photdm-alt:PhotometryFilter):id=_2massH] -->
+</vodmli:instance>

Modified: trunk/projects/dm/vo-dml/mapping/test3.votable.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/test3.votable.xml	Thu Aug 18 10:37:06 2016	(r3506)
+++ trunk/projects/dm/vo-dml/mapping/test3.votable.xml	Thu Aug 18 13:40:58 2016	(r3507)
@@ -86,7 +86,9 @@
 			<VODML>
 				<TYPE>photdm-alt:PhotometricSystem</TYPE>
 			</VODML>
-			<PARAM name="description" datatype="char" arraysize="*" value="The 2MASS phtometric system, consisting of 3 bands"></PARAM>
+			<PARAM name="description" datatype="char" arraysize="*" value="The 2MASS phtometric system, consisting of 3 bands">
+			<VODML><ROLE>photdm-alt:PhotometricSystem.description</ROLE><TYPE>ivoa:string</TYPE></VODML>
+			</PARAM>
 			<GROUP ID="_2massJ">
 				<VODML>
 					<ROLE>photdm-alt:PhotometricSystem.photometryFilter</ROLE>

Added: trunk/projects/dm/vo-dml/mapping/test3.votable.xml.vo-dml.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/vo-dml/mapping/test3.votable.xml.vo-dml.xml	Thu Aug 18 13:40:58 2016	(r3507)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vodmli:instance xmlns:vodmli="http://volute.googlecode.com/dm/vo-dml-instance/v0.x">
+	<model>
+		<vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</vodmlURL>
+		<utypePrefix>ivoa</utypePrefix>
+	</model>
+	<model>
+		<vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml</vodmlURL>
+		<utypePrefix>vodml-map</utypePrefix>
+	</model>
+	<model>
+		<vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/photdm-alt/PhotDM-alt.vo-dml.xml</vodmlURL>
+		<utypePrefix>photdm-alt</utypePrefix>
+	</model>
+	<!-- +++++++++ START GROUP[rank=13|vodmlref=(role=|type=photdm-alt:PhotometricSystem):id=_2mass]: -->
+	<object vodmlref="photdm-alt:PhotometricSystem">
+		<identifier>
+			<transientID>-1</transientID>
+			<altID>
+				<field>_2mass</field>
+				<source>GROUP/@ID</source>
+			</altID>
+		</identifier>
+		<attribute vodmlref="photdm-alt:PhotometricSystem.description" name="description">
+			<primitiveValue vodmlref="ivoa:string">The 2MASS phtometric system, consisting of 3 bands</primitiveValue>
+		</attribute>
+		<collection vodmlref="photdm-alt:PhotometricSystem.photometryFilter" name="photometryFilter">
+			<object vodmlref="photdm-alt:PhotometryFilter">
+				<identifier>
+					<transientID>-2</transientID>
+				</identifier>
+				<attribute vodmlref="photdm-alt:PhotometryFilter.name" name="name">
+					<primitiveValue vodmlref="ivoa:string">J</primitiveValue>
+				</attribute>
+				<attribute vodmlref="photdm-alt:PhotometryFilter.bandName" name="bandName">
+					<primitiveValue vodmlref="ivoa:string">2mass:J</primitiveValue>
+				</attribute>
+				<attribute vodmlref="photdm-alt:PhotometryFilter.spectralLocation" name="spectralLocation">
+					<dataObject vodmlref="ivoa:quantity.RealQuantity">
+						<attribute vodmlref="ivoa:quantity.Quantity.unit" name="unit">
+							<primitiveValue vodmlref="ivoa:quantity.Unit">nm</primitiveValue>
+						</attribute>
+						<attribute vodmlref="ivoa:quantity.RealQuantity.value" name="value">
+							<primitiveValue vodmlref="ivoa:real">1235.0</primitiveValue>
+						</attribute>
+					</dataObject>
+				</attribute>
+			</object>
+			<object vodmlref="photdm-alt:PhotometryFilter">
+				<identifier>
+					<transientID>-3</transientID>
+				</identifier>
+				<attribute vodmlref="photdm-alt:PhotometryFilter.name" name="name">
+					<primitiveValue vodmlref="ivoa:string">H</primitiveValue>
+				</attribute>
+				<attribute vodmlref="photdm-alt:PhotometryFilter.bandName" name="bandName">
+					<primitiveValue vodmlref="ivoa:string">2mass:H</primitiveValue>
+				</attribute>
+				<attribute vodmlref="photdm-alt:PhotometryFilter.spectralLocation" name="spectralLocation">
+					<dataObject vodmlref="ivoa:quantity.RealQuantity">
+						<attribute vodmlref="ivoa:quantity.Quantity.unit" name="unit">
+							<primitiveValue vodmlref="ivoa:quantity.Unit">nm</primitiveValue>
+						</attribute>
+						<attribute vodmlref="ivoa:quantity.RealQuantity.value" name="value">
+							<primitiveValue vodmlref="ivoa:real">1662.0</primitiveValue>
+						</attribute>
+					</dataObject>
+				</attribute>
+			</object>
+		</collection>
+	</object>
+	<!-- +++++++++ END GROUP[rank=13|vodmlref=(role=|type=photdm-alt:PhotometricSystem):id=_2mass] -->
+</vodmli:instance>

Modified: trunk/projects/dm/vo-dml/xsd/vo-dml-instance.xsd
==============================================================================
--- trunk/projects/dm/vo-dml/xsd/vo-dml-instance.xsd	Thu Aug 18 10:37:06 2016	(r3506)
+++ trunk/projects/dm/vo-dml/xsd/vo-dml-instance.xsd	Thu Aug 18 13:40:58 2016	(r3507)
@@ -24,7 +24,7 @@
   <xsd:simpleType name="VODMLREF">
     <xsd:annotation>
       <xsd:documentation>
-      This simpleType allows concatenation of vo-dml:UTYPE-sThis in contrast to the normalized version in vo-dml-instance_utype_normalized.xsd
+      This simpleType allows concatenation of vo-dml:VODMLREF-s.
       TBD define the pattern, is the one below correct?
       </xsd:documentation>
     </xsd:annotation>


More information about the Volutecommits mailing list