[Volute] r3513 - trunk/projects/dm/vo-dml/mapping

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


Author: gerard.lemson
Date: Thu Aug 18 17:21:05 2016
New Revision: 3513

Log:
test votables now point to sample data models.

Modified:
   trunk/projects/dm/vo-dml/mapping/test0.votable.xml
   trunk/projects/dm/vo-dml/mapping/test1.votable.xml
   trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml
   trunk/projects/dm/vo-dml/mapping/test2.votable.xml
   trunk/projects/dm/vo-dml/mapping/test3.votable.xml

Modified: trunk/projects/dm/vo-dml/mapping/test0.votable.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/test0.votable.xml	Thu Aug 18 17:07:04 2016	(r3512)
+++ trunk/projects/dm/vo-dml/mapping/test0.votable.xml	Thu Aug 18 17:21:05 2016	(r3513)
@@ -38,16 +38,16 @@
 	<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">
+			value="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.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">
+			value="ivo://ivoa.org/dm/sample/Filter/1.9">
 			<VODML><ROLE>vodml-map:Model.identifier</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
 		</PARAM>
 		
-		<PARAM name="name" datatype="char" arraysize="*" value="photdm-alt">
+		<PARAM name="name" datatype="char" arraysize="*" value="filter">
 			<VODML><ROLE>vodml-map:Model.name</ROLE><TYPE>ivoa:string</TYPE></VODML>
 		</PARAM>
 	</GROUP>
@@ -143,12 +143,12 @@
     See $7.5.4
     -->
     <GROUP  ID="_2massJ">
-      <VODML><TYPE>photdm-alt:PhotometryFilter</TYPE></VODML>
+      <VODML><TYPE>filter:PhotometryFilter</TYPE></VODML>
       <PARAM name="name" datatype="char" value="2mass:J">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.name</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.name</ROLE></VODML>
       </PARAM>
       <!--  WRONG ! 
-      photdm-alt:PhotometryFilter does not have the Role src:source.SkyCoordinateFrame.name 
+      filter:PhotometryFilter does not have the Role src:source.SkyCoordinateFrame.name 
       -->
       <PARAM name="name" datatype="char" value="FOO">
         <VODML><ROLE>src:source.SkyCoordinateFrame.name</ROLE></VODML>
@@ -157,33 +157,33 @@
     
     
     <GROUP ID="_2massH">
-      <VODML><TYPE>photdm-alt:PhotometryFilter</TYPE></VODML>
+      <VODML><TYPE>filter:PhotometryFilter</TYPE></VODML>
       <PARAM name="name" datatype="char" value="2mass:H">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.name</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.name</ROLE></VODML>
       </PARAM>
     </GROUP>
     <GROUP ID="_2massK">
-      <VODML><TYPE>photdm-alt:PhotometryFilter</TYPE></VODML>
+      <VODML><TYPE>filter:PhotometryFilter</TYPE></VODML>
       <PARAM name="name" datatype="char" value="2mass:K">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.name</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.name</ROLE></VODML>
       </PARAM>
     </GROUP>
     <GROUP ID="_sdssg">
-      <VODML><TYPE>photdm-alt:PhotometryFilter</TYPE></VODML>
+      <VODML><TYPE>filter:PhotometryFilter</TYPE></VODML>
       <PARAM name="id" datatype="char" value="sdss:g">
         <VODML><ROLE>vodml-map:ObjectTypeInstance.ID</ROLE></VODML>
       </PARAM>
       <PARAM name="name" datatype="char" value="sdss:g" >
-        <VODML><ROLE>photdm-alt:PhotometryFilter.name</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.name</ROLE></VODML>
       </PARAM>
     </GROUP>
     <GROUP ID="_sdssr">
-      <VODML><TYPE>photdm-alt:PhotometryFilter</TYPE></VODML>
+      <VODML><TYPE>filter:PhotometryFilter</TYPE></VODML>
       <PARAM name="id" datatype="char" value="sdss:r">
         <VODML><ROLE>vodml-map:ObjectTypeInstance.ID</ROLE></VODML>
       </PARAM>
       <PARAM name="name" datatype="char" value="sdss:r">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.name</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.name</ROLE></VODML>
       </PARAM>
     </GROUP>
     

Modified: trunk/projects/dm/vo-dml/mapping/test1.votable.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/test1.votable.xml	Thu Aug 18 17:07:04 2016	(r3512)
+++ trunk/projects/dm/vo-dml/mapping/test1.votable.xml	Thu Aug 18 17:21:05 2016	(r3513)
@@ -35,16 +35,16 @@
 	<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">
+			value="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.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">
+			value="ivo://ivoa.org/dm/sample/Filter.dm">
 			<VODML><ROLE>vodml-map:Model.identifier</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
 		</PARAM>
 		
-		<PARAM name="name" datatype="char" arraysize="*" value="photdm-alt">
+		<PARAM name="name" datatype="char" arraysize="*" value="filter">
 			<VODML><ROLE>vodml-map:Model.name</ROLE><TYPE>ivoa:string</TYPE></VODML>
 		</PARAM>
 	</GROUP>

Modified: trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml	Thu Aug 18 17:07:04 2016	(r3512)
+++ trunk/projects/dm/vo-dml/mapping/test1e1.votable.xml	Thu Aug 18 17:21:05 2016	(r3513)
@@ -45,16 +45,16 @@
 	<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">
+			value="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.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">
+			value="ivo://ivoa.org/dm/sample/Filter/1.9">
 			<VODML><ROLE>vodml-map:Model.identifier</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
 		</PARAM>
 		
-		<PARAM name="name" datatype="char" arraysize="*" value="photdm-alt">
+		<PARAM name="name" datatype="char" arraysize="*" value="filter">
 			<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. -->

Modified: trunk/projects/dm/vo-dml/mapping/test2.votable.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/test2.votable.xml	Thu Aug 18 17:07:04 2016	(r3512)
+++ trunk/projects/dm/vo-dml/mapping/test2.votable.xml	Thu Aug 18 17:21:05 2016	(r3513)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--  
-Standalore instances from Photdm-alt data model.
+Standalore instances from sample/Filter data model.
 Secial features:
 - standalone instances of objecttype
 - ivoa:quantity.RealQuantity serializing to PARAM (implicit use of PARAM at unit) and explicitly to GROUP
@@ -41,20 +41,20 @@
 	</GROUP>
 	
 	
-<!-- Import photdm-alt model -->
+<!-- Import filter model -->
 	<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">
+			value="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.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">
+			value="ivo://ivoa.org/dm/sample/Filter/1.9">
 			<VODML><ROLE>vodml-map:Model.identifier</ROLE><TYPE>ivoa:anyURI</TYPE></VODML>
 		</PARAM>
 		
-		<PARAM name="name" datatype="char" arraysize="*" value="photdm-alt">
+		<PARAM name="name" datatype="char" arraysize="*" value="filter">
 			<VODML><ROLE>vodml-map:Model.name</ROLE><TYPE>ivoa:string</TYPE></VODML>
 		</PARAM>
 	</GROUP>
@@ -64,29 +64,29 @@
     
     <!-- spectralLocation serialized as PARAM -->
     <GROUP  ID="_2massJ">
-      <VODML><TYPE>photdm-alt:PhotometryFilter</TYPE></VODML>
+      <VODML><TYPE>filter:PhotometryFilter</TYPE></VODML>
       <PARAM name="name" datatype="char" value="J">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.name</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.name</ROLE></VODML>
       </PARAM>
       <PARAM name="name" datatype="char" value="2mass:J">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.bandName</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.bandName</ROLE></VODML>
       </PARAM>
       <PARAM name="name" datatype="float" value="1235" unit="nm">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.spectralLocation</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.spectralLocation</ROLE></VODML>
       </PARAM>
     </GROUP>
     
     <!-- spectralLocation serialized as GROUP -->
     <GROUP ID="_2massH">
-      <VODML><TYPE>photdm-alt:PhotometryFilter</TYPE></VODML>
+      <VODML><TYPE>filter:PhotometryFilter</TYPE></VODML>
       <PARAM name="name" datatype="char" value="H">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.name</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.name</ROLE></VODML>
       </PARAM>
       <PARAM name="name" datatype="char" value="2mass:H">
-        <VODML><ROLE>photdm-alt:PhotometryFilter.bandName</ROLE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.bandName</ROLE></VODML>
       </PARAM>
       <GROUP>
-        <VODML><ROLE>photdm-alt:PhotometryFilter.spectralLocation</ROLE><TYPE>ivoa:quantity.RealQuantity</TYPE></VODML>
+        <VODML><ROLE>filter:PhotometryFilter.spectralLocation</ROLE><TYPE>ivoa:quantity.RealQuantity</TYPE></VODML>
         <PARAM name="unit" datatype="char" arraysize="*" value="nm">
           <VODML><ROLE>ivoa:quantity.Quantity.unit</ROLE><TYPE>ivoa:quantity.Unit</TYPE></VODML>
         </PARAM>

Modified: trunk/projects/dm/vo-dml/mapping/test3.votable.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/test3.votable.xml	Thu Aug 18 17:07:04 2016	(r3512)
+++ trunk/projects/dm/vo-dml/mapping/test3.votable.xml	Thu Aug 18 17:21:05 2016	(r3513)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Standalore instances from Photdm-alt data model. Secial features: - standalone instances of objecttype - ivoa:quantity.RealQuantity 
+<!-- Standalore instances from sample/Filter data model. Secial features: - standalone instances of objecttype - ivoa:quantity.RealQuantity 
 	serializing to PARAM (implicit use of PARAM at unit) and explicitly to GROUP -->
 <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. -->
@@ -50,27 +50,27 @@
 	</GROUP>
 
 
-	<!-- Import photdm-alt model -->
+	<!-- Import filter  model -->
 	<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">
+			value="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.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">
+		<PARAM name="identifier" datatype="char" arraysize="*" value="ivo://ivoa.org/dm/sample/Filter/v1.9">
 			<VODML>
 				<ROLE>vodml-map:Model.identifier</ROLE>
 				<TYPE>ivoa:anyURI</TYPE>
 			</VODML>
 		</PARAM>
 
-		<PARAM name="name" datatype="char" arraysize="*" value="photdm-alt">
+		<PARAM name="name" datatype="char" arraysize="*" value="filter">
 			<VODML>
 				<ROLE>vodml-map:Model.name</ROLE>
 				<TYPE>ivoa:string</TYPE>
@@ -84,29 +84,29 @@
 
 		<GROUP ID="_2mass">
 			<VODML>
-				<TYPE>photdm-alt:PhotometricSystem</TYPE>
+				<TYPE>filter:PhotometricSystem</TYPE>
 			</VODML>
 			<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>
+			<VODML><ROLE>filter:PhotometricSystem.description</ROLE><TYPE>ivoa:string</TYPE></VODML>
 			</PARAM>
 			<GROUP ID="_2massJ">
 				<VODML>
-					<ROLE>photdm-alt:PhotometricSystem.photometryFilter</ROLE>
-					<TYPE>photdm-alt:PhotometryFilter</TYPE>
+					<ROLE>filter:PhotometricSystem.photometryFilter</ROLE>
+					<TYPE>filter:PhotometryFilter</TYPE>
 				</VODML>
 				<PARAM name="name" datatype="char" value="J">
 					<VODML>
-						<ROLE>photdm-alt:PhotometryFilter.name</ROLE>
+						<ROLE>filter:PhotometryFilter.name</ROLE>
 					</VODML>
 				</PARAM>
 				<PARAM name="name" datatype="char" value="2mass:J">
 					<VODML>
-						<ROLE>photdm-alt:PhotometryFilter.bandName</ROLE>
+						<ROLE>filter:PhotometryFilter.bandName</ROLE>
 					</VODML>
 				</PARAM>
 				<PARAM name="name" datatype="float" value="1235" unit="nm">
 					<VODML>
-						<ROLE>photdm-alt:PhotometryFilter.spectralLocation</ROLE>
+						<ROLE>filter:PhotometryFilter.spectralLocation</ROLE>
 					</VODML>
 				</PARAM>
 			</GROUP>
@@ -114,22 +114,22 @@
 			<!-- spectralLocation serialized as GROUP -->
 			<GROUP ID="_2massH">
 				<VODML>
-					<ROLE>photdm-alt:PhotometricSystem.photometryFilter</ROLE>
-					<TYPE>photdm-alt:PhotometryFilter</TYPE>
+					<ROLE>filter:PhotometricSystem.photometryFilter</ROLE>
+					<TYPE>filter:PhotometryFilter</TYPE>
 				</VODML>
 				<PARAM name="name" datatype="char" value="H">
 					<VODML>
-						<ROLE>photdm-alt:PhotometryFilter.name</ROLE>
+						<ROLE>filter:PhotometryFilter.name</ROLE>
 					</VODML>
 				</PARAM>
 				<PARAM name="name" datatype="char" value="2mass:H">
 					<VODML>
-						<ROLE>photdm-alt:PhotometryFilter.bandName</ROLE>
+						<ROLE>filter:PhotometryFilter.bandName</ROLE>
 					</VODML>
 				</PARAM>
 				<GROUP>
 					<VODML>
-						<ROLE>photdm-alt:PhotometryFilter.spectralLocation</ROLE>
+						<ROLE>filter:PhotometryFilter.spectralLocation</ROLE>
 						<TYPE>ivoa:quantity.RealQuantity</TYPE>
 					</VODML>
 					<PARAM name="unit" datatype="char" arraysize="*" value="nm">


More information about the Volutecommits mailing list