[Volute] r3607 - in trunk/projects/dm/vo-dml/mapping/MAST VODML Parser: outJson outJsonLite outMast outVodmli outVotable outVotableAlt

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


Author: tdonaldson
Date: Fri Oct  7 02:22:54 2016
New Revision: 3607

Log:
Fix a problem writing our collection elements.

Modified:
   trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outJson/test3.votable.xml.json
   trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outJsonLite/test3.votable.xml.lite.json
   trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outMast/test3.votable.xml.mast.xml
   trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVodmli/Composition.votable.xml.vo-dml.xml
   trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVodmli/test3.votable.xml.vo-dml.xml
   trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVotable/test3.votable.xml.votable.xml
   trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVotableAlt/test3.votable.xml.votableAlt.xml

Modified: trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outJson/test3.votable.xml.json
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outJson/test3.votable.xml.json	Thu Oct  6 21:34:41 2016	(r3606)
+++ trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outJson/test3.votable.xml.json	Fri Oct  7 02:22:54 2016	(r3607)
@@ -60,14 +60,14 @@
 									},
 								"filter:PhotometryFilter.spectralLocation": 
 									{
-										"__type__": "ivoa:quantity.RealQuantity",
-										"ivoa:quantity.Quantity.unit": 
+										"__type__": "ivoa:RealQuantity",
+										"ivoa:Quantity.unit": 
 											{
 												"__type__": "char",
 												"__arraysize__": "*",
 												"__value__": "nm"
 											},
-										"ivoa:quantity.RealQuantity.value": 
+										"ivoa:RealQuantity.value": 
 											{
 												"__type__": "float",
 												"__value__": 1662

Modified: trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outJsonLite/test3.votable.xml.lite.json
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outJsonLite/test3.votable.xml.lite.json	Thu Oct  6 21:34:41 2016	(r3606)
+++ trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outJsonLite/test3.votable.xml.lite.json	Fri Oct  7 02:22:54 2016	(r3607)
@@ -35,9 +35,9 @@
 								"filter:PhotometryFilter.bandName": "2mass:H",
 								"filter:PhotometryFilter.spectralLocation": 
 									{
-										"__type__": "ivoa:quantity.RealQuantity",
-										"ivoa:quantity.Quantity.unit": "nm",
-										"ivoa:quantity.RealQuantity.value": 1662
+										"__type__": "ivoa:RealQuantity",
+										"ivoa:Quantity.unit": "nm",
+										"ivoa:RealQuantity.value": 1662
 									}
 							}
 						]

Modified: trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outMast/test3.votable.xml.mast.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outMast/test3.votable.xml.mast.xml	Thu Oct  6 21:34:41 2016	(r3606)
+++ trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outMast/test3.votable.xml.mast.xml	Fri Oct  7 02:22:54 2016	(r3607)
@@ -2,4 +2,4 @@
   "status" : "COMPLETE",
   "msg" : "",
   "data" : { ,
-"ExtendedProperties":{"vodmlViewObject":{"modelsByName":{"vodml-map":{"name":"vodml-map","url":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml","identifier":null},"ivoa":{"name":"ivoa","url":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml","identifier":null},"filter":{"name":"filter","url":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.vo-dml.xml","identifier":"ivo://ivoa.org/dm/sample/Filter/v1.9"}},"globalsById":{"_2mass":{"__type__":"filter:PhotometricSystem","__refId__":"_2mass","slots":{"filter:PhotometricSystem.description":{"role":"filter:PhotometricSystem.description","value":{"__primType__":"char","__vodmlType__":"ivoa:string","__arraysize__":"*","__value__":"The 2MASS phtometric system, consisting of 3 bands","__unit__":null}},"filter:PhotometricSystem.photometryFilter":{"role":"filter:PhotometricSystem.photometryFilter","value":[{"__type__":"filter:Photom!
 etryFilte
 r","__refId__":"_2massJ","slots":{"filter:PhotometryFilter.name":{"role":"filter:PhotometryFilter.name","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"J","__unit__":null}},"filter:PhotometryFilter.bandName":{"role":"filter:PhotometryFilter.bandName","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"2mass:J","__unit__":null}},"filter:PhotometryFilter.spectralLocation":{"role":"filter:PhotometryFilter.spectralLocation","value":{"__primType__":"float","__vodmlType__":null,"__arraysize__":null,"__value__":"1235","__unit__":"nm"}}}},{"__type__":"filter:PhotometryFilter","__refId__":"_2massH","slots":{"filter:PhotometryFilter.name":{"role":"filter:PhotometryFilter.name","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"H","__unit__":null}},"filter:PhotometryFilter.bandName":{"role":"filter:PhotometryFilter.bandName","value":{"__primType__":"char","__vodmlType__":null,"__!
 arraysize
 __":null,"__value__":"2mass:H","__unit__":nu!
 ll}},"filter:PhotometryFilter.spectralLocation":{"role":"filter:PhotometryFilter.spectralLocation","value":{"__type__":"ivoa:quantity.RealQuantity","__refId__":null,"slots":{"ivoa:quantity.Quantity.unit":{"role":"ivoa:quantity.Quantity.unit","value":{"__primType__":"char","__vodmlType__":"ivoa:quantity.Unit","__arraysize__":"*","__value__":"nm","__unit__":null}},"ivoa:quantity.RealQuantity.value":{"role":"ivoa:quantity.RealQuantity.value","value":{"__primType__":"float","__vodmlType__":"ivoa:real","__arraysize__":null,"__value__":"1662","__unit__":null}}}}}}}]}}}},"allGlobals":[{"__type__":"filter:PhotometricSystem","__refId__":"_2mass","slots":{"filter:PhotometricSystem.description":{"role":"filter:PhotometricSystem.description","value":{"__primType__":"char","__vodmlType__":"ivoa:string","__arraysize__":"*","__value__":"The 2MASS phtometric system, consisting of 3 bands","__unit__":null}},"filter:PhotometricSystem.photometryFilter":{"role":"filter:PhotometricSystem.photom!
 etryFilte
 r","value":[{"__type__":"filter:PhotometryFilter","__refId__":"_2massJ","slots":{"filter:PhotometryFilter.name":{"role":"filter:PhotometryFilter.name","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"J","__unit__":null}},"filter:PhotometryFilter.bandName":{"role":"filter:PhotometryFilter.bandName","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"2mass:J","__unit__":null}},"filter:PhotometryFilter.spectralLocation":{"role":"filter:PhotometryFilter.spectralLocation","value":{"__primType__":"float","__vodmlType__":null,"__arraysize__":null,"__value__":"1235","__unit__":"nm"}}}},{"__type__":"filter:PhotometryFilter","__refId__":"_2massH","slots":{"filter:PhotometryFilter.name":{"role":"filter:PhotometryFilter.name","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"H","__unit__":null}},"filter:PhotometryFilter.bandName":{"role":"filter:PhotometryFilter.bandName","value":!
 {"__primT
 ype__":"char","__vodmlType__":null,"__arraysize__":nu!
 ll,"__value__":"2mass:H","__unit__":null}},"filter:PhotometryFilter.spectralLocation":{"role":"filter:PhotometryFilter.spectralLocation","value":{"__type__":"ivoa:quantity.RealQuantity","__refId__":null,"slots":{"ivoa:quantity.Quantity.unit":{"role":"ivoa:quantity.Quantity.unit","value":{"__primType__":"char","__vodmlType__":"ivoa:quantity.Unit","__arraysize__":"*","__value__":"nm","__unit__":null}},"ivoa:quantity.RealQuantity.value":{"role":"ivoa:quantity.RealQuantity.value","value":{"__primType__":"float","__vodmlType__":"ivoa:real","__arraysize__":null,"__value__":"1662","__unit__":null}}}}}}}]}}}],"nonIdGlobals":[],"tables":[]},"votMetadata":[{"__tag__":"VOTABLE","__eltId__":1,"__parentId__":0},{"xmlns":"http://www.ivoa.net/xml/VOTable/v1.3_vodml"},[{"__tag__":"GROUP","__eltId__":2,"__parentId__":1},{},[{"__tag__":"VODML","__eltId__":3,"__parentId__":2},{},[{"__tag__":"TYPE","__eltId__":4,"__parentId__":3},{},{"content":"vodml-map:Model"}]],[{"__tag__":"PARAM","__eltId_!
 _":5,"__p
 arentId__":2},{"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"},[{"__tag__":"VODML","__eltId__":6,"__parentId__":5},{},[{"__tag__":"ROLE","__eltId__":7,"__parentId__":6},{},{"content":"vodml-map:Model.url"}],[{"__tag__":"TYPE","__eltId__":8,"__parentId__":6},{},{"content":"ivoa:anyURI"}]]],[{"__tag__":"PARAM","__eltId__":9,"__parentId__":2},{"name":"name","datatype":"char","arraysize":"*","value":"vodml-map"},[{"__tag__":"VODML","__eltId__":10,"__parentId__":9},{},[{"__tag__":"ROLE","__eltId__":11,"__parentId__":10},{},{"content":"vodml-map:Model.name"}],[{"__tag__":"TYPE","__eltId__":12,"__parentId__":10},{},{"content":"ivoa:string"}]]]],[{"__tag__":"GROUP","__eltId__":13,"__parentId__":1},{},[{"__tag__":"VODML","__eltId__":14,"__parentId__":13},{},[{"__tag__":"TYPE","__eltId__":15,"__parentId__":14},{},{"content":"vodml-map:Model"}]],[{"__tag__":"PARAM","__eltId__":16,"__par!
 entId__":
 13},{"name":"name","datatype":"char","arraysize":"*",!
 "value":"ivoa"},[{"__tag__":"VODML","__eltId__":17,"__parentId__":16},{},[{"__tag__":"ROLE","__eltId__":18,"__parentId__":17},{},{"content":"vodml-map:Model.name"}],[{"__tag__":"TYPE","__eltId__":19,"__parentId__":17},{},{"content":"ivoa:string"}]]],[{"__tag__":"PARAM","__eltId__":20,"__parentId__":13},{"name":"url","datatype":"char","arraysize":"*","value":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml"},[{"__tag__":"VODML","__eltId__":21,"__parentId__":20},{},[{"__tag__":"ROLE","__eltId__":22,"__parentId__":21},{},{"content":"vodml-map:Model.url"}],[{"__tag__":"TYPE","__eltId__":23,"__parentId__":21},{},{"content":"ivoa:anyURI"}]]]],[{"__tag__":"GROUP","__eltId__":24,"__parentId__":1},{},[{"__tag__":"VODML","__eltId__":25,"__parentId__":24},{},[{"__tag__":"TYPE","__eltId__":26,"__parentId__":25},{},{"content":"vodml-map:Model"}]],[{"__tag__":"PARAM","__eltId__":27,"__parentId__":24},{"name":"url","datatype":"char","arraysize":"*","value":!
 "http://v
 olute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.vo-dml.xml"},[{"__tag__":"VODML","__eltId__":28,"__parentId__":27},{},[{"__tag__":"ROLE","__eltId__":29,"__parentId__":28},{},{"content":"vodml-map:Model.url"}],[{"__tag__":"TYPE","__eltId__":30,"__parentId__":28},{},{"content":"ivoa:anyURI"}]]],[{"__tag__":"PARAM","__eltId__":31,"__parentId__":24},{"name":"identifier","datatype":"char","arraysize":"*","value":"ivo://ivoa.org/dm/sample/Filter/v1.9"},[{"__tag__":"VODML","__eltId__":32,"__parentId__":31},{},[{"__tag__":"ROLE","__eltId__":33,"__parentId__":32},{},{"content":"vodml-map:Model.identifier"}],[{"__tag__":"TYPE","__eltId__":34,"__parentId__":32},{},{"content":"ivoa:anyURI"}]]],[{"__tag__":"PARAM","__eltId__":35,"__parentId__":24},{"name":"name","datatype":"char","arraysize":"*","value":"filter"},[{"__tag__":"VODML","__eltId__":36,"__parentId__":35},{},[{"__tag__":"ROLE","__eltId__":37,"__parentId__":36},{},{"content":"vodml-map:Model.name"}],[{"!
 __tag__":
 "TYPE","__eltId__":38,"__parentId__":36},{},{"content!
 ":"ivoa:string"}]]]],[{"__tag__":"RESOURCE","__eltId__":39,"__parentId__":1},{"ID":"photometry_system"},[{"__tag__":"GROUP","__eltId__":40,"__parentId__":39},{"ID":"_2mass"},[{"__tag__":"VODML","__eltId__":41,"__parentId__":40},{},[{"__tag__":"TYPE","__eltId__":42,"__parentId__":41},{},{"content":"filter:PhotometricSystem"}]],[{"__tag__":"PARAM","__eltId__":43,"__parentId__":40},{"name":"description","datatype":"char","arraysize":"*","value":"The 2MASS phtometric system, consisting of 3 bands"},[{"__tag__":"VODML","__eltId__":44,"__parentId__":43},{},[{"__tag__":"ROLE","__eltId__":45,"__parentId__":44},{},{"content":"filter:PhotometricSystem.description"}],[{"__tag__":"TYPE","__eltId__":46,"__parentId__":44},{},{"content":"ivoa:string"}]]],[{"__tag__":"GROUP","__eltId__":47,"__parentId__":40},{"ID":"_2massJ"},[{"__tag__":"VODML","__eltId__":48,"__parentId__":47},{},[{"__tag__":"ROLE","__eltId__":49,"__parentId__":48},{},{"content":"filter:PhotometricSystem.photometryFilter"!
 }],[{"__t
 ag__":"TYPE","__eltId__":50,"__parentId__":48},{},{"content":"filter:PhotometryFilter"}]],[{"__tag__":"PARAM","__eltId__":51,"__parentId__":47},{"name":"name","datatype":"char","value":"J"},[{"__tag__":"VODML","__eltId__":52,"__parentId__":51},{},[{"__tag__":"ROLE","__eltId__":53,"__parentId__":52},{},{"content":"filter:PhotometryFilter.name"}]]],[{"__tag__":"PARAM","__eltId__":54,"__parentId__":47},{"name":"name","datatype":"char","value":"2mass:J"},[{"__tag__":"VODML","__eltId__":55,"__parentId__":54},{},[{"__tag__":"ROLE","__eltId__":56,"__parentId__":55},{},{"content":"filter:PhotometryFilter.bandName"}]]],[{"__tag__":"PARAM","__eltId__":57,"__parentId__":47},{"name":"name","datatype":"float","value":"1235","unit":"nm"},[{"__tag__":"VODML","__eltId__":58,"__parentId__":57},{},[{"__tag__":"ROLE","__eltId__":59,"__parentId__":58},{},{"content":"filter:PhotometryFilter.spectralLocation"}]]]],[{"__tag__":"GROUP","__eltId__":60,"__parentId__":40},{"ID":"_2massH"},[{"__tag__"!
 :"VODML",
 "__eltId__":61,"__parentId__":60},{},[{"__tag__":"ROL!
 E","__eltId__":62,"__parentId__":61},{},{"content":"filter:PhotometricSystem.photometryFilter"}],[{"__tag__":"TYPE","__eltId__":63,"__parentId__":61},{},{"content":"filter:PhotometryFilter"}]],[{"__tag__":"PARAM","__eltId__":64,"__parentId__":60},{"name":"name","datatype":"char","value":"H"},[{"__tag__":"VODML","__eltId__":65,"__parentId__":64},{},[{"__tag__":"ROLE","__eltId__":66,"__parentId__":65},{},{"content":"filter:PhotometryFilter.name"}]]],[{"__tag__":"PARAM","__eltId__":67,"__parentId__":60},{"name":"name","datatype":"char","value":"2mass:H"},[{"__tag__":"VODML","__eltId__":68,"__parentId__":67},{},[{"__tag__":"ROLE","__eltId__":69,"__parentId__":68},{},{"content":"filter:PhotometryFilter.bandName"}]]],[{"__tag__":"GROUP","__eltId__":70,"__parentId__":60},{},[{"__tag__":"VODML","__eltId__":71,"__parentId__":70},{},[{"__tag__":"ROLE","__eltId__":72,"__parentId__":71},{},{"content":"filter:PhotometryFilter.spectralLocation"}],[{"__tag__":"TYPE","__eltId__":73,"__pare!
 ntId__":7
 1},{},{"content":"ivoa:quantity.RealQuantity"}]],[{"__tag__":"PARAM","__eltId__":74,"__parentId__":70},{"name":"unit","datatype":"char","arraysize":"*","value":"nm"},[{"__tag__":"VODML","__eltId__":75,"__parentId__":74},{},[{"__tag__":"ROLE","__eltId__":76,"__parentId__":75},{},{"content":"ivoa:quantity.Quantity.unit"}],[{"__tag__":"TYPE","__eltId__":77,"__parentId__":75},{},{"content":"ivoa:quantity.Unit"}]]],[{"__tag__":"PARAM","__eltId__":78,"__parentId__":70},{"name":"value","datatype":"float","value":"1662"},[{"__tag__":"VODML","__eltId__":79,"__parentId__":78},{},[{"__tag__":"ROLE","__eltId__":80,"__parentId__":79},{},{"content":"ivoa:quantity.RealQuantity.value"}],[{"__tag__":"TYPE","__eltId__":81,"__parentId__":79},{},{"content":"ivoa:real"}]]]]]]]]}}}
+"ExtendedProperties":{"vodmlViewObject":{"modelsByName":{"vodml-map":{"name":"vodml-map","url":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml","identifier":null},"ivoa":{"name":"ivoa","url":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml","identifier":null},"filter":{"name":"filter","url":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.vo-dml.xml","identifier":"ivo://ivoa.org/dm/sample/Filter/v1.9"}},"globalsById":{"_2mass":{"__type__":"filter:PhotometricSystem","__refId__":"_2mass","slots":{"filter:PhotometricSystem.description":{"role":"filter:PhotometricSystem.description","value":{"__primType__":"char","__vodmlType__":"ivoa:string","__arraysize__":"*","__value__":"The 2MASS phtometric system, consisting of 3 bands","__unit__":null}},"filter:PhotometricSystem.photometryFilter":{"role":"filter:PhotometricSystem.photometryFilter","value":[{"__type__":"filter:Photom!
 etryFilte
 r","__refId__":"_2massJ","slots":{"filter:PhotometryFilter.name":{"role":"filter:PhotometryFilter.name","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"J","__unit__":null}},"filter:PhotometryFilter.bandName":{"role":"filter:PhotometryFilter.bandName","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"2mass:J","__unit__":null}},"filter:PhotometryFilter.spectralLocation":{"role":"filter:PhotometryFilter.spectralLocation","value":{"__primType__":"float","__vodmlType__":null,"__arraysize__":null,"__value__":"1235","__unit__":"nm"}}}},{"__type__":"filter:PhotometryFilter","__refId__":"_2massH","slots":{"filter:PhotometryFilter.name":{"role":"filter:PhotometryFilter.name","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"H","__unit__":null}},"filter:PhotometryFilter.bandName":{"role":"filter:PhotometryFilter.bandName","value":{"__primType__":"char","__vodmlType__":null,"__!
 arraysize
 __":null,"__value__":"2mass:H","__unit__":nu!
 ll}},"filter:PhotometryFilter.spectralLocation":{"role":"filter:PhotometryFilter.spectralLocation","value":{"__type__":"ivoa:RealQuantity","__refId__":null,"slots":{"ivoa:Quantity.unit":{"role":"ivoa:Quantity.unit","value":{"__primType__":"char","__vodmlType__":"ivoa:Unit","__arraysize__":"*","__value__":"nm","__unit__":null}},"ivoa:RealQuantity.value":{"role":"ivoa:RealQuantity.value","value":{"__primType__":"float","__vodmlType__":"ivoa:real","__arraysize__":null,"__value__":"1662","__unit__":null}}}}}}}]}}}},"allGlobals":[{"__type__":"filter:PhotometricSystem","__refId__":"_2mass","slots":{"filter:PhotometricSystem.description":{"role":"filter:PhotometricSystem.description","value":{"__primType__":"char","__vodmlType__":"ivoa:string","__arraysize__":"*","__value__":"The 2MASS phtometric system, consisting of 3 bands","__unit__":null}},"filter:PhotometricSystem.photometryFilter":{"role":"filter:PhotometricSystem.photometryFilter","value":[{"__type__":"filter:PhotometryFil!
 ter","__r
 efId__":"_2massJ","slots":{"filter:PhotometryFilter.name":{"role":"filter:PhotometryFilter.name","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"J","__unit__":null}},"filter:PhotometryFilter.bandName":{"role":"filter:PhotometryFilter.bandName","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"2mass:J","__unit__":null}},"filter:PhotometryFilter.spectralLocation":{"role":"filter:PhotometryFilter.spectralLocation","value":{"__primType__":"float","__vodmlType__":null,"__arraysize__":null,"__value__":"1235","__unit__":"nm"}}}},{"__type__":"filter:PhotometryFilter","__refId__":"_2massH","slots":{"filter:PhotometryFilter.name":{"role":"filter:PhotometryFilter.name","value":{"__primType__":"char","__vodmlType__":null,"__arraysize__":null,"__value__":"H","__unit__":null}},"filter:PhotometryFilter.bandName":{"role":"filter:PhotometryFilter.bandName","value":{"__primType__":"char","__vodmlType__":null,"__arraysi!
 ze__":nul
 l,"__value__":"2mass:H","__unit__":null}},"filter:Pho!
 tometryFilter.spectralLocation":{"role":"filter:PhotometryFilter.spectralLocation","value":{"__type__":"ivoa:RealQuantity","__refId__":null,"slots":{"ivoa:Quantity.unit":{"role":"ivoa:Quantity.unit","value":{"__primType__":"char","__vodmlType__":"ivoa:Unit","__arraysize__":"*","__value__":"nm","__unit__":null}},"ivoa:RealQuantity.value":{"role":"ivoa:RealQuantity.value","value":{"__primType__":"float","__vodmlType__":"ivoa:real","__arraysize__":null,"__value__":"1662","__unit__":null}}}}}}}]}}}],"nonIdGlobals":[],"tables":[]},"votMetadata":[{"__tag__":"VOTABLE","__eltId__":1,"__parentId__":0},{"xmlns":"http://www.ivoa.net/xml/VOTable/v1.3_vodml"},[{"__tag__":"GROUP","__eltId__":2,"__parentId__":1},{},[{"__tag__":"VODML","__eltId__":3,"__parentId__":2},{},[{"__tag__":"TYPE","__eltId__":4,"__parentId__":3},{},{"content":"vodml-map:Model"}]],[{"__tag__":"PARAM","__eltId__":5,"__parentId__":2},{"name":"url","datatype":"char","arraysize":"*","value":"http://volute.g-vo.org/svn/t!
 runk/proj
 ects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml"},[{"__tag__":"VODML","__eltId__":6,"__parentId__":5},{},[{"__tag__":"ROLE","__eltId__":7,"__parentId__":6},{},{"content":"vodml-map:Model.url"}],[{"__tag__":"TYPE","__eltId__":8,"__parentId__":6},{},{"content":"ivoa:anyURI"}]]],[{"__tag__":"PARAM","__eltId__":9,"__parentId__":2},{"name":"name","datatype":"char","arraysize":"*","value":"vodml-map"},[{"__tag__":"VODML","__eltId__":10,"__parentId__":9},{},[{"__tag__":"ROLE","__eltId__":11,"__parentId__":10},{},{"content":"vodml-map:Model.name"}],[{"__tag__":"TYPE","__eltId__":12,"__parentId__":10},{},{"content":"ivoa:string"}]]]],[{"__tag__":"GROUP","__eltId__":13,"__parentId__":1},{},[{"__tag__":"VODML","__eltId__":14,"__parentId__":13},{},[{"__tag__":"TYPE","__eltId__":15,"__parentId__":14},{},{"content":"vodml-map:Model"}]],[{"__tag__":"PARAM","__eltId__":16,"__parentId__":13},{"name":"name","datatype":"char","arraysize":"*","value":"ivoa"},[{"__tag__":"VODML","__eltId__!
 ":17,"__p
 arentId__":16},{},[{"__tag__":"ROLE","__eltId__":18,"!
 __parentId__":17},{},{"content":"vodml-map:Model.name"}],[{"__tag__":"TYPE","__eltId__":19,"__parentId__":17},{},{"content":"ivoa:string"}]]],[{"__tag__":"PARAM","__eltId__":20,"__parentId__":13},{"name":"url","datatype":"char","arraysize":"*","value":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml"},[{"__tag__":"VODML","__eltId__":21,"__parentId__":20},{},[{"__tag__":"ROLE","__eltId__":22,"__parentId__":21},{},{"content":"vodml-map:Model.url"}],[{"__tag__":"TYPE","__eltId__":23,"__parentId__":21},{},{"content":"ivoa:anyURI"}]]]],[{"__tag__":"GROUP","__eltId__":24,"__parentId__":1},{},[{"__tag__":"VODML","__eltId__":25,"__parentId__":24},{},[{"__tag__":"TYPE","__eltId__":26,"__parentId__":25},{},{"content":"vodml-map:Model"}]],[{"__tag__":"PARAM","__eltId__":27,"__parentId__":24},{"name":"url","datatype":"char","arraysize":"*","value":"http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/sample/filter/Filter.vo-dml.xml"},[{"__tag__":"V!
 ODML","__
 eltId__":28,"__parentId__":27},{},[{"__tag__":"ROLE","__eltId__":29,"__parentId__":28},{},{"content":"vodml-map:Model.url"}],[{"__tag__":"TYPE","__eltId__":30,"__parentId__":28},{},{"content":"ivoa:anyURI"}]]],[{"__tag__":"PARAM","__eltId__":31,"__parentId__":24},{"name":"identifier","datatype":"char","arraysize":"*","value":"ivo://ivoa.org/dm/sample/Filter/v1.9"},[{"__tag__":"VODML","__eltId__":32,"__parentId__":31},{},[{"__tag__":"ROLE","__eltId__":33,"__parentId__":32},{},{"content":"vodml-map:Model.identifier"}],[{"__tag__":"TYPE","__eltId__":34,"__parentId__":32},{},{"content":"ivoa:anyURI"}]]],[{"__tag__":"PARAM","__eltId__":35,"__parentId__":24},{"name":"name","datatype":"char","arraysize":"*","value":"filter"},[{"__tag__":"VODML","__eltId__":36,"__parentId__":35},{},[{"__tag__":"ROLE","__eltId__":37,"__parentId__":36},{},{"content":"vodml-map:Model.name"}],[{"__tag__":"TYPE","__eltId__":38,"__parentId__":36},{},{"content":"ivoa:string"}]]]],[{"__tag__":"RESOURCE","_!
 _eltId__"
 :39,"__parentId__":1},{"ID":"photometry_system"},[{"_!
 _tag__":"GROUP","__eltId__":40,"__parentId__":39},{"ID":"_2mass"},[{"__tag__":"VODML","__eltId__":41,"__parentId__":40},{},[{"__tag__":"TYPE","__eltId__":42,"__parentId__":41},{},{"content":"filter:PhotometricSystem"}]],[{"__tag__":"PARAM","__eltId__":43,"__parentId__":40},{"name":"description","datatype":"char","arraysize":"*","value":"The 2MASS phtometric system, consisting of 3 bands"},[{"__tag__":"VODML","__eltId__":44,"__parentId__":43},{},[{"__tag__":"ROLE","__eltId__":45,"__parentId__":44},{},{"content":"filter:PhotometricSystem.description"}],[{"__tag__":"TYPE","__eltId__":46,"__parentId__":44},{},{"content":"ivoa:string"}]]],[{"__tag__":"GROUP","__eltId__":47,"__parentId__":40},{"ID":"_2massJ"},[{"__tag__":"VODML","__eltId__":48,"__parentId__":47},{},[{"__tag__":"ROLE","__eltId__":49,"__parentId__":48},{},{"content":"filter:PhotometricSystem.photometryFilter"}],[{"__tag__":"TYPE","__eltId__":50,"__parentId__":48},{},{"content":"filter:PhotometryFilter"}]],[{"__tag_!
 _":"PARAM
 ","__eltId__":51,"__parentId__":47},{"name":"name","datatype":"char","value":"J"},[{"__tag__":"VODML","__eltId__":52,"__parentId__":51},{},[{"__tag__":"ROLE","__eltId__":53,"__parentId__":52},{},{"content":"filter:PhotometryFilter.name"}]]],[{"__tag__":"PARAM","__eltId__":54,"__parentId__":47},{"name":"name","datatype":"char","value":"2mass:J"},[{"__tag__":"VODML","__eltId__":55,"__parentId__":54},{},[{"__tag__":"ROLE","__eltId__":56,"__parentId__":55},{},{"content":"filter:PhotometryFilter.bandName"}]]],[{"__tag__":"PARAM","__eltId__":57,"__parentId__":47},{"name":"name","datatype":"float","value":"1235","unit":"nm"},[{"__tag__":"VODML","__eltId__":58,"__parentId__":57},{},[{"__tag__":"ROLE","__eltId__":59,"__parentId__":58},{},{"content":"filter:PhotometryFilter.spectralLocation"}]]]],[{"__tag__":"GROUP","__eltId__":60,"__parentId__":40},{"ID":"_2massH"},[{"__tag__":"VODML","__eltId__":61,"__parentId__":60},{},[{"__tag__":"ROLE","__eltId__":62,"__parentId__":61},{},{"cont!
 ent":"fil
 ter:PhotometricSystem.photometryFilter"}],[{"__tag__"!
 :"TYPE","__eltId__":63,"__parentId__":61},{},{"content":"filter:PhotometryFilter"}]],[{"__tag__":"PARAM","__eltId__":64,"__parentId__":60},{"name":"name","datatype":"char","value":"H"},[{"__tag__":"VODML","__eltId__":65,"__parentId__":64},{},[{"__tag__":"ROLE","__eltId__":66,"__parentId__":65},{},{"content":"filter:PhotometryFilter.name"}]]],[{"__tag__":"PARAM","__eltId__":67,"__parentId__":60},{"name":"name","datatype":"char","value":"2mass:H"},[{"__tag__":"VODML","__eltId__":68,"__parentId__":67},{},[{"__tag__":"ROLE","__eltId__":69,"__parentId__":68},{},{"content":"filter:PhotometryFilter.bandName"}]]],[{"__tag__":"GROUP","__eltId__":70,"__parentId__":60},{},[{"__tag__":"VODML","__eltId__":71,"__parentId__":70},{},[{"__tag__":"ROLE","__eltId__":72,"__parentId__":71},{},{"content":"filter:PhotometryFilter.spectralLocation"}],[{"__tag__":"TYPE","__eltId__":73,"__parentId__":71},{},{"content":"ivoa:RealQuantity"}]],[{"__tag__":"PARAM","__eltId__":74,"__parentId__":70},{"nam!
 e":"unit"
 ,"datatype":"char","arraysize":"*","value":"nm"},[{"__tag__":"VODML","__eltId__":75,"__parentId__":74},{},[{"__tag__":"ROLE","__eltId__":76,"__parentId__":75},{},{"content":"ivoa:Quantity.unit"}],[{"__tag__":"TYPE","__eltId__":77,"__parentId__":75},{},{"content":"ivoa:Unit"}]]],[{"__tag__":"PARAM","__eltId__":78,"__parentId__":70},{"name":"value","datatype":"float","value":"1662"},[{"__tag__":"VODML","__eltId__":79,"__parentId__":78},{},[{"__tag__":"ROLE","__eltId__":80,"__parentId__":79},{},{"content":"ivoa:RealQuantity.value"}],[{"__tag__":"TYPE","__eltId__":81,"__parentId__":79},{},{"content":"ivoa:real"}]]]]]]]]}}}

Modified: trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVodmli/Composition.votable.xml.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVodmli/Composition.votable.xml.vo-dml.xml	Thu Oct  6 21:34:41 2016	(r3606)
+++ trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVodmli/Composition.votable.xml.vo-dml.xml	Fri Oct  7 02:22:54 2016	(r3607)
@@ -1 +1,39 @@
-null
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<vodmli:instance xmlns:vodmli="http://volute.g-vo.org/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>
+    <vodmlrefPrefix>ivoa</vodmlrefPrefix>
+  </model>
+  <model>
+    <vodmlURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/vodml-map/vodml-map.vo-dml.xml</vodmlURL>
+    <vodmlrefPrefix>vodml-map</vodmlrefPrefix>
+  </model>
+  <model>
+    <vodmlURL>http://saada.unistra.fr/voexamples/dali/vodml/Composition/query</vodmlURL>
+    <vodmlrefPrefix>Composition</vodmlrefPrefix>
+    <identifier>ivo://ivoa.org/dm/sample/Composition/1.0</identifier>
+  </model>
+  <object vodmlRef="Composition:base.Airplane">
+    <identifier>
+      <transientID>-1</transientID>
+      <altID>
+        <field>_airplane</field>
+        <source>GROUP/@ID</source>
+      </altID>
+    </identifier>
+    <attribute vodmlRef="vodml-map:ObjectTypeInstance.ID" name="ID">
+      <primitiveValue vodmlRef="ivoa:string">#123454_AP</primitiveValue>
+    </attribute>
+    <attribute vodmlRef="Composition:base.Airplane.SerialNumber" name="SerialNumber">
+      <primitiveValue vodmlRef="ivoa:string">#123454_AP</primitiveValue>
+    </attribute>
+    <attribute vodmlRef="Composition:base.Airplane.Wings" name="Wings">
+      <dataObject vodmlRef="Composition:base.Wing">
+        <collection vodmlRef="Composition:base.Wing.SerialNumber" name="SerialNumber">
+          <primitiveValue vodmlRef="ivoa:string">#67867868_RW</primitiveValue>
+          <primitiveValue vodmlRef="ivoa:string">#89546_LW</primitiveValue>
+        </collection>
+      </dataObject>
+    </attribute>
+  </object>
+</vodmli:instance>

Modified: trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVodmli/test3.votable.xml.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVodmli/test3.votable.xml.vo-dml.xml	Thu Oct  6 21:34:41 2016	(r3606)
+++ trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVodmli/test3.votable.xml.vo-dml.xml	Fri Oct  7 02:22:54 2016	(r3607)
@@ -65,11 +65,11 @@
           <primitiveValue vodmlRef="ivoa:string">2mass:H</primitiveValue>
         </attribute>
         <attribute vodmlRef="filter:PhotometryFilter.spectralLocation" name="spectralLocation">
-          <dataObject vodmlRef="ivoa:quantity.RealQuantity">
-            <attribute vodmlRef="ivoa:quantity.Quantity.unit" name="unit">
-              <primitiveValue vodmlRef="ivoa:quantity.Unit">nm</primitiveValue>
+          <dataObject vodmlRef="ivoa:RealQuantity">
+            <attribute vodmlRef="ivoa:Quantity.unit" name="unit">
+              <primitiveValue vodmlRef="ivoa:Unit">nm</primitiveValue>
             </attribute>
-            <attribute vodmlRef="ivoa:quantity.RealQuantity.value" name="value">
+            <attribute vodmlRef="ivoa:RealQuantity.value" name="value">
               <primitiveValue vodmlRef="ivoa:real">1662</primitiveValue>
             </attribute>
           </dataObject>

Modified: trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVotable/test3.votable.xml.votable.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVotable/test3.votable.xml.votable.xml	Thu Oct  6 21:34:41 2016	(r3606)
+++ trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVotable/test3.votable.xml.votable.xml	Fri Oct  7 02:22:54 2016	(r3607)
@@ -110,17 +110,17 @@
         <GROUP>
           <VODML>
             <ROLE>filter:PhotometryFilter.spectralLocation</ROLE>
-            <TYPE>ivoa:quantity.RealQuantity</TYPE>
+            <TYPE>ivoa:RealQuantity</TYPE>
           </VODML>
           <PARAM name="unit" datatype="char" arraysize="*" value="nm">
             <VODML>
-              <ROLE>ivoa:quantity.Quantity.unit</ROLE>
-              <TYPE>ivoa:quantity.Unit</TYPE>
+              <ROLE>ivoa:Quantity.unit</ROLE>
+              <TYPE>ivoa:Unit</TYPE>
             </VODML>
           </PARAM>
           <PARAM name="value" datatype="float" value="1662">
             <VODML>
-              <ROLE>ivoa:quantity.RealQuantity.value</ROLE>
+              <ROLE>ivoa:RealQuantity.value</ROLE>
               <TYPE>ivoa:real</TYPE>
             </VODML>
           </PARAM>

Modified: trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVotableAlt/test3.votable.xml.votableAlt.xml
==============================================================================
--- trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVotableAlt/test3.votable.xml.votableAlt.xml	Thu Oct  6 21:34:41 2016	(r3606)
+++ trunk/projects/dm/vo-dml/mapping/MAST VODML Parser/outVotableAlt/test3.votable.xml.votableAlt.xml	Fri Oct  7 02:22:54 2016	(r3607)
@@ -44,13 +44,13 @@
             <SLOT>
               <SROLE>filter:PhotometryFilter.spectralLocation</SROLE>
               <INSTANCE>
-                <ITYPE>ivoa:quantity.RealQuantity</ITYPE>
+                <ITYPE>ivoa:RealQuantity</ITYPE>
                 <SLOT>
-                  <SROLE>ivoa:quantity.Quantity.unit</SROLE>
+                  <SROLE>ivoa:Quantity.unit</SROLE>
                   <PRIMITIVE type="char" arraysize="*">nm</PRIMITIVE>
                 </SLOT>
                 <SLOT>
-                  <SROLE>ivoa:quantity.RealQuantity.value</SROLE>
+                  <SROLE>ivoa:RealQuantity.value</SROLE>
                   <PRIMITIVE type="float">1662</PRIMITIVE>
                 </SLOT>
               </INSTANCE>


More information about the Volutecommits mailing list