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

Volute commit messages volutecommits at g-vo.org
Thu Feb 23 16:53:37 CET 2017


Author: gerard.lemson
Date: Thu Feb 23 16:53:37 2017
New Revision: 3872

Log:
updated test5, validates.

Modified:
   trunk/projects/dm/vo-dml/mapping/test5.votable-1.4.xml

Modified: trunk/projects/dm/vo-dml/mapping/test5.votable-1.4.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/test5.votable-1.4.xml	Fri Feb 17 12:49:38 2017	(r3871)
+++ trunk/projects/dm/vo-dml/mapping/test5.votable-1.4.xml	Thu Feb 23 16:53:37 2017	(r3872)
@@ -3,20 +3,13 @@
   models used in the VO-DML and Mapping documents. This sample contains mapping to TABLEs including ORM relations between them. -->
 <VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.ivoa.net/xml/VOTable/v1.4_vodml http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/xsd/ext/VOTable-1.4_vodml.xsd"
-  >
-<!-- 
-  xsi:schemaLocation="http://www.ivoa.net/xml/VOTable/v1.4_vodml file:///C:/workspaces/eclipse-luna-4.4.1/vo-urp-etc/vo-dml-g-vo/xsd/ext/VOTable-1.4_vodml.xsd"
- -->
+ >
 <VODML>
     <MODEL> 
       <NAME>ivoa</NAME>
       <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>vodml-map</NAME>
-      <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>filter</NAME>
       <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.vo-dml.xml</URL>
       <IDENTIFIER>ivo://ivoa.org/dm/sample/Filter/1.9</IDENTIFIER>
@@ -30,49 +23,49 @@
 
     <INSTANCE ID="_icrs" dmtype="sample:catalog.SkyCoordinateFrame">
       <ATTRIBUTE dmrole="sample:catalog.SkyCoordinateFrame.name">
-        <LITERAL value="ICRS" />
+        <LITERAL value="ICRS"  dmtype="ivoa:string"/>
       </ATTRIBUTE>
     </INSTANCE>
 
     <INSTANCE ID="_2massH" dmtype="filter:PhotometryFilter">
-      <IDENTIFIER><IDFIELD><LITERAL value="_2massH"/></IDFIELD></IDENTIFIER>
+      <PRIMARYKEY><PKFIELD><LITERAL value="_2massH" dmtype="ivoa:string"/></PKFIELD></PRIMARYKEY>
       <ATTRIBUTE dmrole="filter:PhotometryFilter.name">
-        <LITERAL value="2mass:H"/>
+        <LITERAL value="2mass:H" dmtype="ivoa:string"/>
       </ATTRIBUTE>
     </INSTANCE>
 
     <INSTANCE ID="_2massJ" dmtype="filter:PhotometryFilter">
-      <IDENTIFIER><IDFIELD><LITERAL value="_2massJ"/></IDFIELD></IDENTIFIER>
+      <PRIMARYKEY><PKFIELD><LITERAL value="_2massJ" dmtype="ivoa:string"/></PKFIELD></PRIMARYKEY>
       <ATTRIBUTE dmrole="filter:PhotometryFilter.name">
-        <LITERAL value="2mass:J"/>
+        <LITERAL value="2mass:J" dmtype="ivoa:string"/>
       </ATTRIBUTE>
     </INSTANCE>
 
     <INSTANCE ID="_2massK" dmtype="filter:PhotometryFilter">
-      <IDENTIFIER><IDFIELD><LITERAL value="_2massK"/></IDFIELD></IDENTIFIER>
+      <PRIMARYKEY><PKFIELD><LITERAL value="_2massK" dmtype="ivoa:string"/></PKFIELD></PRIMARYKEY>
       <ATTRIBUTE dmrole="filter:PhotometryFilter.name">
-        <LITERAL value="2mass:K"/>
+        <LITERAL value="2mass:K" dmtype="ivoa:string"/>
       </ATTRIBUTE>
     </INSTANCE>
 
   </GLOBALS>
   <GLOBALS ID="_SDSS_FILTERS">
     <INSTANCE dmtype="filter:PhotometryFilter">
-      <IDENTIFIER><IDFIELD><LITERAL value="sdss:g"/></IDFIELD></IDENTIFIER>
+      <PRIMARYKEY><PKFIELD><LITERAL value="sdss:g" dmtype="ivoa:string"/></PKFIELD></PRIMARYKEY>
       <ATTRIBUTE dmrole="filter:PhotometryFilter.name">
-        <LITERAL value="sdss:g"/>
+        <LITERAL value="sdss:g" dmtype="ivoa:string"/>
       </ATTRIBUTE>
     </INSTANCE>
     <INSTANCE  dmtype="filter:PhotometryFilter">
-      <IDENTIFIER><IDFIELD><LITERAL value="sdss:r"/></IDFIELD></IDENTIFIER>
+      <PRIMARYKEY><PKFIELD><LITERAL value="sdss:r" dmtype="ivoa:string"/></PKFIELD></PRIMARYKEY>
       <ATTRIBUTE dmrole="filter:PhotometryFilter.name">
-        <LITERAL value="sdss:r"/>
+        <LITERAL value="sdss:r" dmtype="ivoa:string"/>
       </ATTRIBUTE>
     </INSTANCE>
     <INSTANCE  dmtype="filter:PhotometryFilter">
-      <IDENTIFIER><IDFIELD><LITERAL value="sdss:u"/></IDFIELD></IDENTIFIER>
+      <PRIMARYKEY><PKFIELD><LITERAL value="sdss:u" dmtype="ivoa:string"/></PKFIELD></PRIMARYKEY>
       <ATTRIBUTE dmrole="filter:PhotometryFilter.name">
-        <LITERAL value="sdss:u"/>
+        <LITERAL value="sdss:u" dmtype="ivoa:string"/>
       </ATTRIBUTE>
     </INSTANCE>
 
@@ -80,21 +73,25 @@
   
       <TEMPLATES tableref="_table1">
         <INSTANCE  ID="_source" dmtype="sample:catalog.Source">
-          <IDENTIFIER>
-            <IDFIELD>
-               <COLUMN ref="_designation" />
-            </IDFIELD>
-          </IDENTIFIER>
-          <ATTRIBUTE dmrole="sample:catalog.AbstractSource.name">
-            <COLUMN ref="_designation" />
+          <PRIMARYKEY>
+            <PKFIELD>
+               <COLUMN ref="_designation"  dmtype="ivoa:string"/>
+            </PKFIELD>
+          </PRIMARYKEY>
+          <!-- possible error -->
+          <!--  
+          <ATTRIBUTE dmrole="filter:PhotometryFilter.name">
+          -->
+          <ATTRIBUTE  dmrole="sample:catalog.AbstractSource.name"> 
+            <COLUMN ref="_designation" dmtype="ivoa:string"/>
           </ATTRIBUTE>
           <ATTRIBUTE dmrole="sample:catalog.AbstractSource.position">
             <INSTANCE dmtype="sample:catalog.SkyCoordinate">
               <ATTRIBUTE dmrole="sample:catalog.SkyCoordinate.longitude">
-                <COLUMN ref="_ra" />
+                <COLUMN ref="_ra" dmtype="ivoa:real"/>
               </ATTRIBUTE>
               <ATTRIBUTE dmrole="sample:catalog.SkyCoordinate.latitude">
-                <COLUMN ref="_dec" />
+                <COLUMN ref="_dec" dmtype="ivoa:real"/>
               </ATTRIBUTE>
               <REFERENCE dmrole="sample:catalog.SkyCoordinate.frame">
                 <IDREF>_icrs</IDREF>
@@ -105,13 +102,13 @@
           <COMPOSITION dmrole="sample:catalog.AbstractSource.luminosity">
             <INSTANCE dmtype="sample:catalog.LuminosityMeasurement">
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.value">
-                <COLUMN ref="_magH" />
+                <COLUMN ref="_magH"  dmtype="ivoa:real"/>
               </ATTRIBUTE>
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.error">
-                <COLUMN ref="_errH" />
+                <COLUMN ref="_errH"  dmtype="ivoa:real"/>
               </ATTRIBUTE>
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.type">
-                <LITERAL value="magnitude"/>
+                <LITERAL value="magnitude" dmtype="sample:catalog.LuminosityType" />
               </ATTRIBUTE>
               <REFERENCE dmrole="sample:catalog.LuminosityMeasurement.filter">
                 <IDREF>_2massH</IDREF>
@@ -119,13 +116,13 @@
             </INSTANCE>
             <INSTANCE dmtype="sample:catalog.LuminosityMeasurement">
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.value">
-                <COLUMN ref="_magJ" />
+                <COLUMN ref="_magJ"  dmtype="ivoa:real"/>
               </ATTRIBUTE>
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.error">
-                <COLUMN ref="_errJ" />
+                <COLUMN ref="_errJ"  dmtype="ivoa:real"/>
               </ATTRIBUTE>
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.type">
-                <LITERAL value="magnitude"/>
+                <LITERAL value="magnitude" dmtype="sample:catalog.LuminosityType" />
               </ATTRIBUTE>
               <REFERENCE dmrole="sample:catalog.LuminosityMeasurement.filter">
                 <IDREF>_2massJ</IDREF>
@@ -133,13 +130,13 @@
             </INSTANCE>
             <INSTANCE dmtype="sample:catalog.LuminosityMeasurement">
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.value">
-                <COLUMN ref="_magK" />
+                <COLUMN ref="_magK" dmtype="ivoa:real" />
               </ATTRIBUTE>
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.error">
-                <COLUMN ref="_errK" />
+                <COLUMN ref="_errK"  dmtype="ivoa:real"/>
               </ATTRIBUTE>
               <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.type">
-                <LITERAL value="magnitude"/>
+                <LITERAL value="magnitude"  dmtype="sample:catalog.LuminosityType" />
               </ATTRIBUTE>
               <REFERENCE dmrole="sample:catalog.LuminosityMeasurement.filter">
                 <IDREF>_2massK</IDREF>
@@ -151,23 +148,23 @@
       </TEMPLATES>
     <TEMPLATES tableref="_sdss_mags">
 
-    <INSTANCE ID="SDSS_MAGS" dmtype="src:source.LuminosityMeasurement">
+    <INSTANCE ID="SDSS_MAGS" dmtype="sample:catalog.LuminosityMeasurement">
       <CONTAINER>
         <FOREIGNKEY>
-        <IDFIELD><COLUMN ref="_container"/></IDFIELD>
+        <PKFIELD><COLUMN ref="_container" dmtype="ivoa:string"/></PKFIELD>
         <TARGETID>_source</TARGETID>
         </FOREIGNKEY>
       </CONTAINER>
-      <ATTRIBUTE dmrole="src:source.LuminosityMeasurement.value">
-        <COLUMN ref="_mag"/>
+      <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.value">
+        <COLUMN ref="_mag" dmtype="ivoa:real"/>
       </ATTRIBUTE>
-      <ATTRIBUTE dmrole="src:source.LuminosityMeasurement.error">
-        <COLUMN ref="_eMag"/>
+      <ATTRIBUTE dmrole="sample:catalog.LuminosityMeasurement.error">
+        <COLUMN ref="_eMag" dmtype="ivoa:real"/>
       </ATTRIBUTE>
       <!-- Following is example of OR-like reference, but not to another table but to a singleton object -->
-      <REFERENCE dmrole="src:source.LuminosityMeasurement.filter">
+      <REFERENCE dmrole="sample:catalog.LuminosityMeasurement.filter">
         <FOREIGNKEY>
-        <IDFIELD><COLUMN ref="_filter"/></IDFIELD>
+        <PKFIELD><COLUMN ref="_filter" dmtype="ivoa:string"/></PKFIELD>
         <TARGETID>_SDSS_FILTERS</TARGETID>
         </FOREIGNKEY>
         


More information about the Volutecommits mailing list