Skip to content

Add a forMode attribute to several elements #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add a forMode attribute to several elements #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc1c6b0
Adding forMode attributes to several TAPRegExt elements.
msdemlei Sep 29, 2025
551c9e8
Tiny spelling and whitespace fixes
mbtaylor Oct 1, 2025
70bcf36
Attempting a clarification on repeated mode-dependent declarations.
msdemlei Oct 2, 2025
7165975
Merge branch 'add-for-mode' of github.com:msdemlei/TAPRegExt into add…
msdemlei Oct 2, 2025
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ivoatex/Makefile:


sample.xml: make-sample.sh
./make-sample.sh > sample.xml
./make-sample.sh

install:
# local to Markus' setup
Expand Down
57 changes: 49 additions & 8 deletions TAPRegExt-v1.1.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:vr="http://www.ivoa.net/xml/VOResource/v1.0"
xmlns:vm="http://www.ivoa.net/xml/VOMetadata/v0.1"
xmlns:tr="http://www.ivoa.net/xml/TAPRegExt/v1.0"
version="1.1-pre1"
version="1.1-pre3"
targetNamespace="http://www.ivoa.net/xml/TAPRegExt/v1.0"
elementFormDefault="unqualified"
attributeFormDefault="unqualified"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelberg.de/docs/schemata/XMLSchema.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<xs:annotation>
<xs:appinfo>
<vm:schemaName>TAPRegExt</vm:schemaName>
Expand All @@ -22,6 +21,42 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:annotation>
<xs:import namespace="http://www.ivoa.net/xml/VOResource/v1.0"
schemaLocation="https://www.ivoa.net/xml/VOResource/VOResource-v1.0.xsd"/>

<xs:attributeGroup name="mode-dependent">
<xs:annotation>
<xs:documentation>
This attribute group is intended to be used wherever a TAPRegExt
declaration might depend on the access mode. Currently, only
sync vs. async is supported.
</xs:documentation>
</xs:annotation>
<xs:attribute name="forMode">
<xs:annotation>
<xs:documentation>
This declaration only applies to the named mode.
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:NMTOKEN">
<xs:enumeration value="sync">
<xs:annotation>
<xs:documentation>
This declaration is for synchronous queries.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="async">
<xs:annotation>
<xs:documentation>
This declaration is for asynchronous queries.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup>

<xs:complexType name="TableAccess">
<xs:annotation>
<xs:documentation>
Expand Down Expand Up @@ -79,7 +114,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:element>

<xs:element name="retentionPeriod" type="tr:TimeLimits"
minOccurs="0" maxOccurs="1">
minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Limits on the time between job creation and
Expand All @@ -89,7 +124,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:element>

<xs:element name="executionDuration" type="tr:TimeLimits"
minOccurs="0" maxOccurs="1">
minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Limits on executionDuration.
Expand All @@ -98,7 +133,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:element>

<xs:element name="outputLimit" type="tr:DataLimits"
minOccurs="0" maxOccurs="1">
minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Limits on the size of data returned.
Expand All @@ -107,7 +142,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:element>

<xs:element name="uploadLimit" type="tr:DataLimits"
minOccurs="0" maxOccurs="1">
minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Limits on the size of uploaded data.
Expand Down Expand Up @@ -471,6 +506,8 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber

</xs:sequence>

<xs:attributeGroup ref="tr:mode-dependent"/>

<xs:attribute name="ivo-id" type="xs:anyURI">
<xs:annotation>
<xs:documentation>
Expand All @@ -487,7 +524,6 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:documentation>
</xs:annotation>
</xs:attribute>

</xs:complexType>

<xs:complexType name="UploadMethod">
Expand Down Expand Up @@ -517,6 +553,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attributeGroup ref="tr:mode-dependent"/>
</xs:restriction>
</xs:complexContent>
</xs:complexType>
Expand Down Expand Up @@ -547,6 +584,8 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:annotation>
</xs:element>
</xs:sequence>

<xs:attributeGroup ref="tr:mode-dependent"/>
</xs:complexType>

<xs:complexType name="DataLimits">
Expand Down Expand Up @@ -574,6 +613,8 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:annotation>
</xs:element>
</xs:sequence>

<xs:attributeGroup ref="tr:mode-dependent"/>
</xs:complexType>

<xs:complexType name="DataLimit">
Expand Down
Loading