Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/resources/tap2VOSI.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</xsl:template>
<xsl:template match="table/columns/column">
<column>
<xsl:apply-templates select="(column_name,description,unit,ucd,utype,datatype,indexed,principal)"/>
<xsl:apply-templates select="(column_name,description,unit,ucd,utype,datatype,indexed,principal,nullable)"/>
</column>
</xsl:template>
<xsl:template match="indexed">
Expand All @@ -47,6 +47,11 @@
<xsl:template match="principal">
<flag>primary</flag>
</xsl:template>
<xsl:template match="nullable[text()='true']">
<flag>nullable</flag>
</xsl:template>
<!-- suppress output for nullable=false -->
<xsl:template match="nullable"/>
Comment thread
pahjbo marked this conversation as resolved.
Comment thread
pahjbo marked this conversation as resolved.
<xsl:template match="datatype">
<xsl:element name="dataType" >
<xsl:attribute name="type" namespace="http://www.w3.org/2001/XMLSchema-instance">vs:VOTableType</xsl:attribute>
Expand Down
12 changes: 12 additions & 0 deletions src/main/vo-dml/tapschema.vo-dml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,18 @@
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
<attribute>
<vodml-id>column.nullable</vodml-id>
<name>nullable</name>
<description>indicates whether the column may have null values</description>
<datatype>
<vodml-ref>ivoa:boolean</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
<attribute>
<vodml-id>column.column_index</vodml-id>
<name>column_index</name>
Expand Down
1 change: 1 addition & 0 deletions src/main/vodsl/tapschema.vodsl
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ query. In cases where the service selects the columns to return (such as a
query language without an explicit output selection), the principal column
indicates those columns that are returned by default";
std: ivoa:boolean "is the column defined by a standard";
nullable: ivoa:boolean @? "indicates whether the column may have null values";
column_index: ivoa:integer @? "used to recommend table ordering for clients. Clients
may order by index (ascending) so lower index items would appear
earlier in a listing.";
Expand Down
Loading