[Volute] r3977 - trunk/projects/dm/vo-dml/models/tesselation

Volute commit messages volutecommits at g-vo.org
Thu Apr 27 09:35:17 CEST 2017


Author: lmichel
Date: Thu Apr 27 09:35:17 2017
New Revision: 3977

Log:
Validation errors fixed

Modified:
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.xml

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy	Wed Apr 26 16:09:14 2017	(r3976)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy	Thu Apr 27 09:35:17 2017	(r3977)
@@ -112,7 +112,7 @@
                 	  
                		  instance(role: "coords_tessel:domain.spatial.Position2D.error", type: "coords_tessel:domain.spatial.StatisticalError2D") {
                   	  	instance(role: "coords_tessel:domain.spatial.StatisticalError2D.statError", type: "coords_tessel:dtypes.dtypes.Ellipse") {
-                 	      column(role: "semiAxis", id: "error_maj_csa_100", data: error_maj_csa)
+                 	      column(role: "dtypes.Ellipse.semiAxis", id: "error_maj_csa_100", data: error_maj_csa)
                  	      instance(role: "coords_tessel:dtypes.Ellipse.posAngle",type: "ivoa:Quantity", value: "0")    
                 	     }
                 	  }    

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml	Wed Apr 26 16:09:14 2017	(r3976)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml	Thu Apr 27 09:35:17 2017	(r3977)
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3" -->
 
+<!--  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 ../../xsd/ext/VOTable-1.4_vodml.xsd" -->
+
 <VOTABLE 
-  version="1.3" 
-  xmlns="http://www.ivoa.net/xml/VOTable/v1.3" 
+  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.3 http://vo.ari.uni-heidelberg.de/docs/schemata/VOTable-1.3.xsd">
+  xsi:schemaLocation="http://www.ivoa.net/xml/VOTable/v1.4_vodml ../../xsd/ext/VOTable-1.4_vodml.xsd">
 
   <VODML>
     <MODEL>
@@ -81,7 +85,7 @@
                 <ATTRIBUTE dmrole="coord_tessel:domain.spatial.Tile.skyindex">
                   <INSTANCE dmtype="coordsys_tessel:domain.spatial.Tile.skyindex">
                     <ATTRIBUTE dmrole="coord_tessel:domain.spatial.SkyIndex.loc">
-                      <COLUMN dmtype="" ref="healpix_csa_100"/>
+                      <COLUMN dmtype="ivoa:integer" ref="healpix_csa_100"/>
                     </ATTRIBUTE>
                   </INSTANCE>
                 </ATTRIBUTE>
@@ -126,8 +130,8 @@
                     <ATTRIBUTE dmrole="coords_tessel:dtypes.Ellipse.posAngle">
                       <LITERAL value="0" dmtype="ivoa:Quantity"/>
                     </ATTRIBUTE>
-                    <ATTRIBUTE dmrole="semiAxis">
-                      <COLUMN dmtype="" ref="error_maj_csa_100"/>
+                    <ATTRIBUTE dmrole="coords_tessel:dtypes.Ellipse.semiAxis">
+                      <COLUMN dmtype="ivoa:RealQuantity" ref="error_maj_csa_100"/>
                     </ATTRIBUTE>
                   </INSTANCE>
                 </ATTRIBUTE>
@@ -135,18 +139,18 @@
             </COMPOSITION>
           </INSTANCE>
         </ATTRIBUTE>
-        <REFERENCE dmrole="coordsys_tessel:domain.spatial.spaceFrame">
-          <IDREF>_coordspaceframe</IDREF>
-        </REFERENCE>
-        <REFERENCE dmrole="coordsys_tessel:domain.spatial.tesselation">
-          <IDREF>_healpixspaceframe</IDREF>
-        </REFERENCE>
         <ATTRIBUTE dmrole="lmsource:source.Source.name">
           <COLUMN dmtype="ivoa:string" ref="namesaada_100"/>
         </ATTRIBUTE>
         <ATTRIBUTE dmrole="lmsource:source.Source.parallax">
           <COLUMN dmtype="ivoa:quantity.Quantity" ref="parallax_csa_100"/>
         </ATTRIBUTE>
+        <REFERENCE dmrole="coordsys_tessel:domain.spatial.spaceFrame">
+          <IDREF>_coordspaceframe</IDREF>      
+        </REFERENCE>
+         <REFERENCE dmrole="coordsys_tessel:domain.spatial.tesselation">
+          <IDREF>_healpixspaceframe</IDREF>
+        </REFERENCE> 
       </INSTANCE>
     </TEMPLATES>
   </VODML>	
@@ -164,16 +168,15 @@
 ]]>
 	
 	</DESCRIPTION>
-	<COOSYS ID="ICRS" system="ICRS"/>
 	<RESOURCE type="results"><DESCRIPTION>TAP1.0</DESCRIPTION>
 		<INFO name="QUERY_STATUS" value="OK"/>
 		<INFO name="LANGUAGE" value="ADQL"/>
-		<INFO name="QUERY"><![CDATA[SELECT "CATALOGUE_ENTRY.namesaada", "CATALOGUE_ENTRY.pos_ra_csa", "CATALOGUE_ENTRY.pos_dec_csa", "CATALOGUE_ENTRY.healpix_csa", "CATALOGUE_ENTRY.error_maj_csa"
+		<INFO name="QUERY" value="Query"><![CDATA[SELECT "CATALOGUE_ENTRY.namesaada", "CATALOGUE_ENTRY.pos_ra_csa", "CATALOGUE_ENTRY.pos_dec_csa", "CATALOGUE_ENTRY.healpix_csa", "CATALOGUE_ENTRY.error_maj_csa"
 FROM CATALOGUE_ENTRY AS CATALOGUE_ENTRY]]></INFO>
-		<TABLE name="Results">
+		<TABLE name="Results" ID="_table1">
 			<GROUP ID="_healpix">
-				<PARAM name="healpix_schema" id="_healpix_schema" value="NESTED"/>
-				<PARAM name="healpix_order"  id="_healpix_order" value="13"/>
+				<PARAM datatype="char" arraysize="*"  name="healpix_schema" ID="_healpix_schema" value="NESTED"/>
+				<PARAM datatype="int" name="healpix_order"  ID="_healpix_order" value="13"/>
 			</GROUP>
 			<FIELD ID="namesaada_100" name="namesaada" datatype="char" ucd="meta.id" arraysize="*">
 				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.xml	Wed Apr 26 16:09:14 2017	(r3976)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.xml	Thu Apr 27 09:35:17 2017	(r3977)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3">
+<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 ../../xsd/ext/VOTable-1.4_vodml.xsd">
 	
 <DESCRIPTION><![CDATA[
 SaadaDB:
@@ -15,16 +18,15 @@
 ]]>
 	
 	</DESCRIPTION>
-	<COOSYS ID="ICRS" system="ICRS"/>
 	<RESOURCE type="results"><DESCRIPTION>TAP1.0</DESCRIPTION>
 		<INFO name="QUERY_STATUS" value="OK"/>
 		<INFO name="LANGUAGE" value="ADQL"/>
-		<INFO name="QUERY"><![CDATA[SELECT "CATALOGUE_ENTRY.namesaada", "CATALOGUE_ENTRY.pos_ra_csa", "CATALOGUE_ENTRY.pos_dec_csa", "CATALOGUE_ENTRY.healpix_csa", "CATALOGUE_ENTRY.error_maj_csa"
+		<INFO name="QUERY" value="query"><![CDATA[SELECT "CATALOGUE_ENTRY.namesaada", "CATALOGUE_ENTRY.pos_ra_csa", "CATALOGUE_ENTRY.pos_dec_csa", "CATALOGUE_ENTRY.healpix_csa", "CATALOGUE_ENTRY.error_maj_csa"
 FROM CATALOGUE_ENTRY AS CATALOGUE_ENTRY]]></INFO>
-		<TABLE name="Results">
+		<TABLE name="Results" ID= "_table1">
 			<GROUP ID="_healpix">
-				<PARAM name="healpix_schema" value="NESTED">
-				<PARAM name="healpix_order" value="13">
+				<PARAM datatype="char" arraysize="*"  name="healpix_schema" ID="_healpix_schema" value="NESTED"/>
+				<PARAM datatype="int" name="healpix_order"  ID="_healpix_order" value="13"/>
 			</GROUP>
 			<FIELD ID="namesaada_100" name="namesaada" datatype="char" ucd="meta.id" arraysize="*">
 				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>


More information about the Volutecommits mailing list