diff --git a/yml/dp02_obscore.yaml b/yml/dp02_obscore.yaml index c6b950a1..9a18717c 100644 --- a/yml/dp02_obscore.yaml +++ b/yml/dp02_obscore.yaml @@ -19,8 +19,8 @@ tables: tap:principal: 1 tap:column_index: 10 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: dataproduct_subtype "@id": "ObsCore.dataproduct_subtype" description: Data product specific type @@ -31,8 +31,8 @@ tables: tap:principal: 1 tap:column_index: 20 ivoa:unit: - datatype: char - votable:arraysize: 64 + datatype: string + length: 64 - name: obs_title "@id": "ObsCore.obs_title" description: Brief description of dataset in free format @@ -43,7 +43,8 @@ tables: tap:principal: 1 tap:column_index: 225 ivoa:unit: - datatype: char + datatype: string + length: 256 votable:arraysize: "*" - name: facility_name "@id": "ObsCore.facility_name" @@ -55,8 +56,8 @@ tables: tap:principal: 1 tap:column_index: 210 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: calib_level "@id": "ObsCore.calib_level" description: "Calibration level of the observation: in {0, 1, 2, 3, 4}" @@ -78,8 +79,8 @@ tables: tap:principal: 0 tap:column_index: 270 ivoa:unit: - datatype: char - votable:arraysize: 32 + datatype: string + length: 32 - name: obs_id "@id": "ObsCore.obs_id" description: Internal ID given by the ObsTAP service @@ -90,8 +91,8 @@ tables: tap:principal: 1 tap:column_index: 180 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: obs_collection "@id": "ObsCore.obs_collection" description: Name of the data collection @@ -102,8 +103,8 @@ tables: tap:principal: 1 tap:column_index: 190 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: obs_publisher_did "@id": "ObsCore.obs_publisher_did" description: ID for the Dataset given by the publisher @@ -114,8 +115,8 @@ tables: tap:principal: 0 tap:column_index: 260 ivoa:unit: - datatype: char - votable:arraysize: 256 + datatype: string + length: 256 - name: access_url "@id": "ObsCore.access_url" description: URL used to access dataset @@ -126,7 +127,7 @@ tables: tap:principal: 1 tap:column_index: 240 ivoa:unit: - datatype: char + datatype: text votable:arraysize: "*" votable:xtype: clob - name: access_format @@ -139,8 +140,8 @@ tables: tap:principal: 1 tap:column_index: 250 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: s_ra "@id": "ObsCore.s_ra" description: Central Spatial Position in ICRS; Right ascension @@ -184,8 +185,8 @@ tables: tap:principal: 1 tap:column_index: 230 ivoa:unit: - datatype: char - votable:arraysize: 512 + datatype: string + length: 512 - name: s_resolution "@id": "ObsCore.s_resolution" description: Spatial resolution of data as FWHM of PSF @@ -328,8 +329,8 @@ tables: tap:principal: 1 tap:column_index: 200 ivoa:unit: - datatype: char - votable:arraysize: 32 + datatype: string + length: 32 - name: pol_xel "@id": "ObsCore.pol_xel" description: Number of elements along the polarization axis @@ -351,8 +352,8 @@ tables: tap:principal: 1 tap:column_index: 220 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: lsst_visit "@id": "ObsCore.lsst_visit" description: Identifier for a specific LSSTCam pointing @@ -418,7 +419,7 @@ tables: tap:principal: 1 tap:column_index: 40 ivoa:unit: - datatype: char + datatype: string length: 10 votable:arraysize: 10 - name: lsst_filter @@ -431,6 +432,6 @@ tables: tap:principal: 1 tap:column_index: 90 ivoa:unit: - datatype: char + datatype: string length: 10 votable:arraysize: 10 diff --git a/yml/imsim.yaml b/yml/imsim.yaml index a53e962a..660c9f43 100644 --- a/yml/imsim.yaml +++ b/yml/imsim.yaml @@ -8031,7 +8031,7 @@ tables: - name: band "@id": "#ForcedSourceOnDiaObject.band" datatype: char - mysql:datatype: CHAR(1) + length: 1 description: Abstract filter that is not associated with a particular instrument fits:tunit: - name: ccdVisitId diff --git a/yml/obsloctap.yaml b/yml/obsloctap.yaml index 4b2e9940..4662004c 100644 --- a/yml/obsloctap.yaml +++ b/yml/obsloctap.yaml @@ -216,8 +216,8 @@ tables: tap:column_index: 17 ivoa:unit: datatype: string - votable:arraysize: "*" length: 40 + votable:arraysize: "*" - name: pol_states "@id": "#ObsPlan.pol_states" description: List of polarization states or NULL if not applicable diff --git a/yml/oga_live_obscore.yaml b/yml/oga_live_obscore.yaml index 3c2a5013..a0cd8939 100644 --- a/yml/oga_live_obscore.yaml +++ b/yml/oga_live_obscore.yaml @@ -19,8 +19,8 @@ tables: tap:principal: 1 tap:column_index: 10 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: dataproduct_subtype "@id": "ObsCore.dataproduct_subtype" description: Data product specific type @@ -31,8 +31,8 @@ tables: tap:principal: 1 tap:column_index: 20 ivoa:unit: - datatype: char - votable:arraysize: 64 + datatype: string + length: 64 - name: facility_name "@id": "ObsCore.facility_name" description: The name of the facility, telescope, or space craft used for the observation @@ -43,8 +43,8 @@ tables: tap:principal: 1 tap:column_index: 210 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: calib_level "@id": "ObsCore.calib_level" description: "Calibration level of the observation: in {0, 1, 2, 3, 4}" @@ -66,8 +66,8 @@ tables: tap:principal: 0 tap:column_index: 270 ivoa:unit: - datatype: char - votable:arraysize: 32 + datatype: string + length: 32 - name: obs_id "@id": "ObsCore.obs_id" description: Internal ID given by the ObsTAP service @@ -78,8 +78,8 @@ tables: tap:principal: 1 tap:column_index: 180 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: obs_collection "@id": "ObsCore.obs_collection" description: Name of the data collection @@ -90,8 +90,8 @@ tables: tap:principal: 1 tap:column_index: 190 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: obs_publisher_did "@id": "ObsCore.obs_publisher_did" description: ID for the Dataset given by the publisher @@ -102,8 +102,8 @@ tables: tap:principal: 0 tap:column_index: 260 ivoa:unit: - datatype: char - votable:arraysize: 256 + datatype: string + length: 256 - name: access_url "@id": "ObsCore.access_url" description: URL used to access dataset @@ -114,7 +114,7 @@ tables: tap:principal: 1 tap:column_index: 240 ivoa:unit: - datatype: char + datatype: text votable:arraysize: "*" votable:xtype: clob - name: access_format @@ -127,8 +127,8 @@ tables: tap:principal: 1 tap:column_index: 250 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: s_ra "@id": "ObsCore.s_ra" description: Central Spatial Position in ICRS; Right ascension @@ -172,8 +172,8 @@ tables: tap:principal: 1 tap:column_index: 230 ivoa:unit: - datatype: char - votable:arraysize: 512 + datatype: string + length: 512 - name: s_resolution "@id": "ObsCore.s_resolution" description: Spatial resolution of data as FWHM of PSF @@ -316,8 +316,8 @@ tables: tap:principal: 1 tap:column_index: 200 ivoa:unit: - datatype: char - votable:arraysize: 32 + datatype: string + length: 32 - name: pol_xel "@id": "ObsCore.pol_xel" description: Number of elements along the polarization axis @@ -339,8 +339,8 @@ tables: tap:principal: 1 tap:column_index: 220 ivoa:unit: - datatype: char - votable:arraysize: 128 + datatype: string + length: 128 - name: lsst_visit "@id": "ObsCore.lsst_visit" description: Identifier for a specific LSSTCam pointing @@ -395,7 +395,7 @@ tables: tap:principal: 1 tap:column_index: 40 ivoa:unit: - datatype: char + datatype: string length: 10 votable:arraysize: 10 - name: lsst_filter @@ -408,6 +408,6 @@ tables: tap:principal: 1 tap:column_index: 90 ivoa:unit: - datatype: char + datatype: string length: 10 votable:arraysize: 10