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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ivoatex Makefile. The ivoatex/README for the targets available.

SCHEMA_FILE=TAPRegExt-v1.1.xsd
SCHEMA_FILE=TAPRegExt-v1.1.xsd

# short name of your document (edit $DOCNAME.tex; would be like RegTAP)
DOCNAME = TAPRegExt
Expand All @@ -24,7 +24,7 @@ SOURCES = $(DOCNAME).tex $(SCHEMA_FILE) sample.xml gitmeta.tex role_diagram.pdf
FIGURES = role_diagram.svg

# List of PDF figures (for vector graphics)
VECTORFIGURES =
VECTORFIGURES =


# Additional files to distribute (e.g., CSS, schema files, examples...)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ to be registered.
The last stable version is
**[REC-1.0](https://www.ivoa.net/documents/TAPRegExt/20120827/)**.

The version in development is WD-1.1 and a
The version in development is WD-1.1 and a
[![PDF-Preview](https://img.shields.io/badge/Preview-PDF-blue)](../../releases/download/auto-pdf-preview/TAPRegExt-draft.pdf)
is automatically produced from this repository

Expand All @@ -19,7 +19,7 @@ The document source is in TAPRegExt.tex and TAPRegExt-v*.xsd is the schema itsel
dumprecord.py is a program that generates sample.xml from the capabilities
record for the TAP service of GAVO DaCHS. It will thus only work if
you have GAVO DaCHS installed, and you will most certainly not want that
for the purpose of building this document.
for the purpose of building this document.


[![Creative Commons License](https://i.creativecommons.org/l/by-sa/4.0/88x31.png)](http://creativecommons.org/licenses/by-sa/4.0/)
Expand Down
62 changes: 31 additions & 31 deletions TAPRegExt-v1.1.xsd
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema
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"
<xs:schema
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"
targetNamespace="http://www.ivoa.net/xml/TAPRegExt/v1.0"
elementFormDefault="unqualified"
attributeFormDefault="unqualified"
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">
<xs:annotation>
Expand All @@ -20,7 +20,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
A description of the capabilities metadata for TAP services.
</xs:documentation>
</xs:annotation>
<xs:import namespace="http://www.ivoa.net/xml/VOResource/v1.0"
<xs:import namespace="http://www.ivoa.net/xml/VOResource/v1.0"
schemaLocation="https://www.ivoa.net/xml/VOResource/VOResource-v1.0.xsd"/>
<xs:complexType name="TableAccess">
<xs:annotation>
Expand All @@ -40,7 +40,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Identifier of IVOA-approved data model supported by the
Identifier of IVOA-approved data model supported by the
service.
</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -115,7 +115,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:annotation>
</xs:element>


</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand All @@ -134,7 +134,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
which the endpoint is operated.
</xs:documentation>
</xs:annotation>

<xs:complexContent>
<xs:extension base="vr:Interface">
<xs:sequence>
Expand Down Expand Up @@ -240,24 +240,24 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
<xs:complexType name="DataModelType">
<xs:annotation>
<xs:documentation>
An IVOA defined data model, identified by an IVORN
An IVOA defined data model, identified by an IVORN
intended for machine consumption and a short label
intended for human comsumption.
</xs:documentation>
</xs:annotation>

<xs:simpleContent>
<xs:extension base="xs:token">
<xs:extension base="xs:token">
<xs:attribute name="ivo-id" type="xs:anyURI" use="required">
<xs:annotation>
<xs:documentation>
The IVOID of the data model.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:extension>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:complexType>

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

<xs:element name="languageFeatures" type="tr:LanguageFeatureList"
<xs:element name="languageFeatures" type="tr:LanguageFeatureList"
minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Expand All @@ -313,7 +313,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:complexType>

<xs:complexType name="Version">
<xs:annotation>
Expand All @@ -340,7 +340,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
<xs:documentation>
To more formally define a language supported by a service,
a resource record for the language can be created, either
centrally on the Registry of Registries or by other registry operators.
centrally on the Registry of Registries or by other registry operators.
When such a record exists, the ivo-id attribute of language
should point to it.
</xs:documentation>
Expand All @@ -353,12 +353,12 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
<xs:complexType name="LanguageFeatureList">
<xs:annotation>
<xs:documentation>
An enumeration of non-standard or non-mandatory features of
An enumeration of non-standard or non-mandatory features of
a specific type implemented by the language.
</xs:documentation>
<xs:documentation>
A feature type is a language-dependent concept like
"user defined function", "geometry support", or possibly
A feature type is a language-dependent concept like
"user defined function", "geometry support", or possibly
"units supported". A featureList gives all features of
a given type applicable for the service. Multiple featureLists
are possible.
Expand All @@ -382,7 +382,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:annotation>
</xs:element>
</xs:sequence>
<xs:attribute name="type" type="xs:anyURI"
<xs:attribute name="type" type="xs:anyURI"
use="required">
<xs:annotation>
<xs:documentation>
Expand Down Expand Up @@ -432,8 +432,8 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
An output format supported by the service.
</xs:documentation>
<xs:documentation>
All TAP services must support VOTable output, with media types as
requested by the FORMAT parameter if applicable (cf.~section 2.7.1
All TAP services must support VOTable output, with media types as
requested by the FORMAT parameter if applicable (cf.~section 2.7.1
of the TAP standard).

The primary identifier for an output format is the RFC 2046 media
Expand All @@ -453,7 +453,7 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:documentation>
<xs:documentation>
The format of this string is specified by RFC 2046.
The service has to accept this string as a
The service has to accept this string as a
value of the FORMAT parameter.
</xs:documentation>
</xs:annotation>
Expand All @@ -463,14 +463,14 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Other values of FORMAT ("shorthands") that make the service return
Other values of FORMAT ("shorthands") that make the service return
documents with the media type.
</xs:documentation>
</xs:annotation>
</xs:element>

</xs:sequence>

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

</xs:complexType>
</xs:complexType>

<xs:complexType name="UploadMethod">
<xs:annotation>
<xs:documentation>
An upload method as defined by IVOA.
</xs:documentation>
<xs:documentation>
Upload methods are always identified by an IVOID.
Upload methods are always identified by an IVOID.
Descriptions can be obtained by dereferencing this
IVOID. To see values defined in TAPRegExt,
retrieve the ivo://ivoa.net/std/TAPRegExt
Expand Down Expand Up @@ -602,4 +602,4 @@ xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://vo.ari.uni-heidelber
</xs:simpleContent>
</xs:complexType>

</xs:schema>
</xs:schema>
Loading
Loading