Skip to content

Fix bug #18 #22

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 3 commits into
base: main
Choose a base branch
from
Open

Fix bug #18 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8396fe7
Replacing suitable occurrences of 1.2 with 1.3.
msdemlei Apr 17, 2025
3f77597
Deprecating @ivo-id on Content and Creator.
msdemlei Apr 17, 2025
c72b282
Clarifying the use of inactive and deleted in Resource/@status.
msdemlei Apr 17, 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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
DOCNAME = VOResource

# count up; you probably do not want to bother with versions <1.0
DOCVERSION = 1.2
DOCVERSION = 1.3

# Publication date, ISO format; update manually for "releases"
DOCDATE = 2025-04-16
DOCDATE = 2025-10-31

# What is it you're writing: NOTE, WD, PR, or REC
DOCTYPE = REC
DOCTYPE = WD

# Source files for the TeX document (but the main file must always
# be called $(DOCNAME).tex
Expand All @@ -35,7 +35,7 @@ ivoatex/Makefile:
git submodule update --init

STILTS ?= stilts
SCHEMA_FILE=VOResource-v1.2.xsd
SCHEMA_FILE=VOResource-v1.3.xsd

# These tests need stilts >3.4 and xmlstarlet
test:
Expand Down
28 changes: 18 additions & 10 deletions VOResource-v1.2.xsd → VOResource-v1.3.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
xmlns:vm="http://www.ivoa.net/xml/VOMetadata/v0.1"
elementFormDefault="unqualified"
attributeFormDefault="unqualified"
version="1.2">
version="1.3-wd1">

<!-- NOTE: target namespace ends in v1.0 in order to not break 1.0 clients.
This is nevertheless the 1.2 schema, as given by the version attribute.
This is nevertheless the 1.3 schema, as given by the version attribute.
For details, see http://ivoa.net/documents/Notes/XMLVers -->

<xs:annotation>
Expand Down Expand Up @@ -200,22 +200,31 @@ For details, see http://ivoa.net/documents/Notes/XMLVers -->
<xs:enumeration value="active">
<xs:annotation>
<xs:documentation>
resource is believed to be currently maintained, and its
description is up to date (default).
The resource is available and maintained by the
publisher (default).
</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="inactive">
<xs:annotation>
<xs:documentation>
resource is apparently not being maintained at the present.
The resource is temporarily offline but is expected to
resume operations at some later date; publishers in this
case could publish an estimate when that will happen in a
date element with a role of Available. Note that inactive
resources do not show up in RegTAP searchable registries.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="deleted">
<xs:annotation>
<xs:documentation>
resource publisher has explicitly deleted the resource.
This status could be used for resources permanently
unavailable if VOResource metadata should still be
available via OAI-PMH; in the current VO, there is
probably no reason to ever do that, and deleted
records also do not show up in RegTAP searchable
registries.
Copy link
Contributor

@tsdower tsdower Apr 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noting a reason to ever do that, though it is invisible to RegTAP search users: the MAST registry continues to support OAI record persistence per https://www.openarchives.org/OAI/openarchivesprotocol.html#DeletedRecords, and when marking ivo_managed local records deleted, updates their VOResource@status to such. This makes it consistently match the OAI wrapper active/deleted status throughout the xml metadata layers and history queries.

So far I am intending to keep this behavior with the rewrite.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I had originally noted this keeps the record status matching OAI wrapper status in ListRecords responses, but checking the spec it is indeed wrong to include the whole resource there, which is an issue we addressed a while back and I had forgotten. I do still like the idea of keeping it in sync even hidden from most interfaces, but it's less pressing.)

</xs:documentation>
</xs:annotation>
</xs:enumeration>
Expand Down Expand Up @@ -577,8 +586,8 @@ For details, see http://ivoa.net/documents/Notes/XMLVers -->
<xs:attribute name="ivo-id" type="vr:IdentifierURI">
<xs:annotation>
<xs:documentation>
An IVOA identifier for the contact (typically when it is
an organization).
Deprecated. Use the ivo-id attribute of the name child
instead.
</xs:documentation>
</xs:annotation>
</xs:attribute>
Expand Down Expand Up @@ -639,8 +648,7 @@ For details, see http://ivoa.net/documents/Notes/XMLVers -->
<xs:attribute name="ivo-id" type="vr:IdentifierURI">
<xs:annotation>
<xs:documentation>
An IVOA identifier for the creator (typically when it is
an organization).
Deprecated. Use the ivo-id attribute of the name child instead.
</xs:documentation>
</xs:annotation>
</xs:attribute>
Expand Down
Loading