Skip to content

Commit dd99f87

Browse files
lmichellmichel
committed
set status values as strings
1 parent 0c21dc4 commit dd99f87

17 files changed

+376
-438
lines changed

‎doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DOCNAME = MANGO
77
DOCVERSION = 0.1
88

99
# Publication date, ISO format; update manually for "releases"
10-
DOCDATE = 2025-06-02
10+
DOCDATE = 2025-06-06
1111

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

‎doc/ivoatexmeta.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% GENERATED FILE -- edit this in the Makefile
22
\newcommand{\ivoaDocversion}{0.1}
3-
\newcommand{\ivoaDocdate}{2025-06-02}
4-
\newcommand{\ivoaDocdatecode}{20250602}
3+
\newcommand{\ivoaDocdate}{2025-06-06}
4+
\newcommand{\ivoaDocdatecode}{20250606}
55
\newcommand{\ivoaDoctype}{PR}
66
\newcommand{\ivoaDocname}{MANGO}
77
\renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO}

‎doc/model.tex

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ \section{Model: mango }
5858
\textbf{multiplicity: 1} \newline
5959
Reference to the associated \texttt{MangoObject}.
6060

61-
\subsection{BitField}
62-
\label{sect:BitField}
63-
Property for which each possible value is represented by a bit, so that multiple states can be contained in the same integer value. The possible values are defined in the associated \texttt{StatusValues}, which must correspond to a bit pattern (each value must be a power of 2). This constraint is not enforced by the model.
64-
6561
\subsection{Brightness}
6662
\label{sect:Brightness}
6763
Observed brightness of the \texttt{MangoObject}. The purpose of this property is to gather a brightness value with its error and the its photometric calibration The distinction between fluxes and magnitudes is made by the unit. The photometric calibration is modeled by the \texttt{Phot} data model (1.1).
@@ -459,11 +455,11 @@ \section{Model: mango }
459455

460456
\subsection{Status}
461457
\label{sect:Status}
462-
Property representing a status defined by a integer number that can only take on a defined number of values, each with its own description. Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0 for False and 1 for True.
458+
Property representing a status defined by a string (numerical values must be down-casted) that can only take on a defined number of values, each with its own description.
463459

464460
\subsubsection{Status.status}
465461
\textbf{vodml-id: Status.status} \newline
466-
\textbf{type: \hyperref[sect:ivoa]{ivoa:integer}} \newline
462+
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
467463
\textbf{multiplicity: 1} \newline
468464
Actual value of the status
469465

@@ -479,7 +475,7 @@ \section{Model: mango }
479475

480476
\subsubsection{StatusValue.value}
481477
\textbf{vodml-id: StatusValue.value} \newline
482-
\textbf{type: \hyperref[sect:ivoa]{ivoa:integer}} \newline
478+
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
483479
\textbf{multiplicity: 1} \newline
484480
Allowed value for a \texttt{Status}
485481

‎doc/model_toc.tex

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,11 @@ \section{Other Properties}
426426

427427
\subsection{Status}
428428
\label{sect:Status}
429-
Property representing a status defined by a integer number that can only take on a defined number of values, each with its own description. Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0 for False and 1 for True.
429+
Property representing a status defined by a string (numerical values must be down-casted) that can only take on a defined number of values, each with its own description.
430430

431431
\subsubsection{Status.status}
432432
\textbf{vodml-id: Status.status} \newline
433-
\textbf{type: \hyperref[sect:ivoa]{ivoa:integer}} \newline
433+
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
434434
\textbf{multiplicity: 1} \newline
435435
Actual value of the status
436436

@@ -456,7 +456,7 @@ \section{Other Properties}
456456

457457
\subsubsection{StatusValue.value}
458458
\textbf{vodml-id: StatusValue.value} \newline
459-
\textbf{type: \hyperref[sect:ivoa]{ivoa:integer}} \newline
459+
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
460460
\textbf{multiplicity: 1} \newline
461461
Allowed value for a \texttt{Status}
462462

@@ -467,8 +467,6 @@ \section{Other Properties}
467467
Free text description of the allowed value for a \texttt{Status}
468468

469469
\subsection{BitField}
470-
\label{sect:BitField}
471-
Property for which each possible value is represented by a bit, so that multiple states can be contained in the same integer value. The possible values are defined in the associated \texttt{StatusValues}, which must correspond to a bit pattern (each value must be a power of 2). This constraint is not enforced by the model.
472470

473471
\subsection{DataLink}
474472
\label{sect:DataLink}

‎mivot/mango/mango.BitField.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎mivot/mango/mango.Status.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<INSTANCE dmrole="" dmtype="mango:Status">
2-
<!-- Property representing a status defined by a integer number
2+
<!-- Property representing a status defined by a string (numerical values must be down-casted)
33
that can only take on a defined number of values, each with its own description.
4-
Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0 for False and 1 for True." -->
4+
" -->
55
<INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
66
<!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
77
<ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
@@ -11,14 +11,14 @@ Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0
1111
<COLLECTION dmrole="mango:Property.associatedProperties">
1212
<INSTANCE dmtype="mango:Property"/>
1313
</COLLECTION>
14-
<ATTRIBUTE dmrole="mango:Status.status" dmtype="ivoa:integer" unit="" ref="@@@@@" value=""/>
14+
<ATTRIBUTE dmrole="mango:Status.status" dmtype="ivoa:string" ref="@@@@@" value=""/>
1515
<INSTANCE dmrole="mango:Status.allowedValues" dmtype="mango:StatusValues">
1616
<!-- Class holder for the list of the allowed values for the status.
1717
" -->
1818
<COLLECTION dmrole="mango:StatusValues.values">
1919
<INSTANCE dmrole="" dmtype="mango:StatusValue">
2020
<!-- Value allowed for a status; contain the value with a free text description." -->
21-
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:integer" unit="" ref="@@@@@" value=""/>
21+
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
2222
<ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
2323
</INSTANCE>
2424
</COLLECTION>

‎mivot/mango/mango.StatusValue.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<INSTANCE dmrole="" dmtype="mango:StatusValue">
22
<!-- Value allowed for a status; contain the value with a free text description." -->
3-
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:integer" unit="" ref="@@@@@" value=""/>
3+
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
44
<ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
55
</INSTANCE>

‎mivot/mango/mango.StatusValues.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<COLLECTION dmrole="mango:StatusValues.values">
55
<INSTANCE dmrole="" dmtype="mango:StatusValue">
66
<!-- Value allowed for a status; contain the value with a free text description." -->
7-
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:integer" unit="" ref="@@@@@" value=""/>
7+
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
88
<ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
99
</INSTANCE>
1010
</COLLECTION>

0 commit comments

Comments
 (0)