Skip to content

Commit

Permalink
Issue 66: member.memberID becomes member.ref
Browse files Browse the repository at this point in the history
  • Loading branch information
michmech committed Jan 4, 2024
1 parent 634b9e3 commit 246d4b6
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 67 deletions.
24 changes: 12 additions & 12 deletions dmlex-v1.0/specification/examples/examples/12.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
- sense (id: lens-1)
- definition (text: curved glass that makes things seem bigger)
- relation (type: meronymy)
- member (memberID: glasses-1, role: whole)
- member (memberID: lens-1, role: part)
- member (ref: glasses-1, role: whole)
- member (ref: lens-1, role: part)
- relation (type: meronymy)
- member (memberID: microscrope-1, role: whole)
- member (memberID: lens-1, role: part)
- member (ref: microscrope-1, role: whole)
- member (ref: lens-1, role: part)
- relationType (type: meronomy, description: part-whole relationship)
- memberType (role: whole, type: sense, min: 1, max: 1, hint: navigate)
- memberType (role: part, type: sense, min: 1, max: 1, hint: navigate)
Expand Down Expand Up @@ -59,12 +59,12 @@
</sense>
</entry>
<relation type="meronymy">
<member memberID="glasses-1" role="whole"/>
<member memberID="lens-1" role="part"/>
<member ref="glasses-1" role="whole"/>
<member ref="lens-1" role="part"/>
</relation>
<relation type="meronymy">
<member memberID="microscrope-1" role="whole"/>
<member memberID="lens-1" role="part"/>
<member ref="microscrope-1" role="whole"/>
<member ref="lens-1" role="part"/>
</relation>
<relationType type="meronomy">
<description>part-whole relationship</description>
Expand Down Expand Up @@ -103,19 +103,19 @@
"relations": [{
"type": "meronymy",
"members": [{
"memberID": "glasses-1",
"ref": "glasses-1",
"role": "whole"
}, {
"memberID": "lens-1",
"ref": "lens-1",
"role": "part"
}]
}, {
"type": "meronymy",
"members": [{
"memberID": "microscope-1",
"ref": "microscope-1",
"role": "whole"
}, {
"memberId": "lens-1",
"ref": "lens-1",
"role": "part"
}]
}],
Expand Down
12 changes: 6 additions & 6 deletions dmlex-v1.0/specification/examples/examples/13.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
- sense (id: sell-1)
- definition (text: exchange something for money)
- relation (type: antonyms)
- member (memberID: buy-1)
- member (memberID: sell-1)
- member (ref: buy-1)
- member (ref: sell-1)
- relationType: (type: antonyms)
- memberType (type: sense, min: 2, max: 2, hint: navigate)
</programlisting>
Expand All @@ -45,8 +45,8 @@
&lt;/sense&gt;
&lt;/entry&gt;
&lt;relation type="antonyms"&gt;
&lt;member memberID="buy-1"/&gt;
&lt;member memberID="sell-1"/&gt;
&lt;member ref="buy-1"/&gt;
&lt;member ref="sell-1"/&gt;
&lt;/relation&gt;
&lt;relationType type="antonyms"&gt;
&lt;memberType type="sense" min="2" max="2" hint="navigate"/&gt;
Expand Down Expand Up @@ -77,8 +77,8 @@
"relations": [{
"type": "antonyms",
"members": [
{"memberID": "buy-1"},
{"memberID": "sell-1"}
{"ref": "buy-1"},
{"ref": "sell-1"}
]
}],
"relationTypes": [{
Expand Down
18 changes: 9 additions & 9 deletions dmlex-v1.0/specification/examples/examples/14.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
- sense (id: der-ozean-1)
- headwordTranslation (text: ocean)
- relation (type: synonyms, description: words that mean sea and ocean)
- member (memberID: die-see-1)
- member (memberID: das-meer-1)
- member (memberID: der-ozean-1)
- member (ref: die-see-1)
- member (ref: das-meer-1)
- member (ref: der-ozean-1)
- relationType (type: synonyms, description: synonyms and near synonyms)
memberType (type: sense, min: 2, hint: navigate)
</programlisting>
Expand Down Expand Up @@ -65,9 +65,9 @@
&lt;/entry&gt;
&lt;relation type="synonyms"&gt;
&lt;description&gt;words that mean sea and ocean&lt;/description&gt;
&lt;member memberID="die-see-1"/&gt;
&lt;member memberID="das-meer-1"/&gt;
&lt;member memberID="der-ozean-1"/&gt;
&lt;member ref="die-see-1"/&gt;
&lt;member ref="das-meer-1"/&gt;
&lt;member ref="der-ozean-1"/&gt;
&lt;/relation&gt;
&lt;relationType type="synonyms"&gt;
&lt;description&gt;synonyms and near synonyms&lt;/description&gt;
Expand Down Expand Up @@ -112,9 +112,9 @@
"type": "synonyms",
"description": "words that mean sea and ocean",
"members": [
{"memberID": "die-see-1"},
{"memberID": "das-meer-1"},
{"memberID": "der-ozean-1"}
{"ref": "die-see-1"},
{"ref": "das-meer-1"},
{"ref": "der-ozean-1"}
]
}],
"relationTypes": [{
Expand Down
12 changes: 6 additions & 6 deletions dmlex-v1.0/specification/examples/examples/15.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
- partOfSpeech (tag: n)
- label (tag: americanSpelling)
- relation (type: variants)
- member (memberID: colour)
- member (memberID: color)
- member (ref: colour)
- member (ref: color)
- relationType (type: variants, description: words which differ only in spelling)
- memberType (type: entry, min: 2, hint: navigate)
</programlisting>
Expand All @@ -53,8 +53,8 @@
&lt;label tag="americanSpelling"/&gt;
&lt;/entry&gt;
&lt;relation type="variants"&gt;
&lt;member memberID="colour"/&gt;
&lt;member memberID="color"/&gt;
&lt;member ref="colour"/&gt;
&lt;member ref="color"/&gt;
&lt;/relation&gt;
&lt;relationType type="variants"&gt;
&lt;description&gt;words which differ only in spelling&lt;/description&gt;
Expand Down Expand Up @@ -88,8 +88,8 @@
"relations": [{
"type": "variants",
"members": [
{"memberID": "colour"},
{"memberID": "color"}
{"ref": "colour"},
{"ref": "color"}
]
}],
"relationTypes": [{
Expand Down
24 changes: 12 additions & 12 deletions dmlex-v1.0/specification/examples/examples/16.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
- definition (text: interest or excitement)
- example (text: Examples add colour to your writing.)
- relation (type: subsensing)
- member (memberID: colour-1, role: super)
- member (memberID: colour-2, role: sub)
- member (rer: colour-1, role: super)
- member (ref: colour-2, role: sub)
- relation (type: subsensing)
- member (memberID: colour-1, role: super)
- member (memberID: colour-3, role: sub)
- member (ref: colour-1, role: super)
- member (ref: colour-3, role: sub)
- relationType (type: subsensing, scopeRestriction: sameEntry)
- memberType (role: super, type: sense, min: 1, max: 1, hint: none)
- memberRole (role: sub, type: sense, min: 1, max: 1, hint: embed)
Expand Down Expand Up @@ -64,12 +64,12 @@
&lt;/sense&gt;
&lt;/entry&gt;
&lt;relation type="subsensing"&gt;
&lt;member memberID="colour-1" role="super"/&gt;
&lt;member memberID="colour-2" role="sub"/&gt;
&lt;member ref="colour-1" role="super"/&gt;
&lt;member ref="colour-2" role="sub"/&gt;
&lt;/relation&gt;
&lt;relation type="subsensing"&gt;
&lt;member memberID="colour-1" role="super"/&gt;
&lt;member memberID="colour-3" role="sub"/&gt;
&lt;member ref="colour-1" role="super"/&gt;
&lt;member ref="colour-3" role="sub"/&gt;
&lt;/relation&gt;
&lt;relationType type="subsensing" scopeRestriction="sameEntry"&gt;
&lt;memberType role="super" type="sense" min="1" max="1" hint="none"/&gt;
Expand Down Expand Up @@ -108,14 +108,14 @@
"relations": [{
"type": "subsensing",
"members": [
{"role": "super", "memberID": "colour-1"},
{"role": "sub", "memberID": "colour-2"}
{"role": "super", "ref": "colour-1"},
{"role": "sub", "ref": "colour-2"}
]
}, {
"type": "subsensing",
"members": [
{"role": "super", "memberID": "colour-1"},
{"role": "sub", "memberID": "colour-3"}
{"role": "super", "ref": "colour-1"},
{"role": "sub", "ref": "colour-3"}
]
}],
"relationTypes": [{
Expand Down
12 changes: 6 additions & 6 deletions dmlex-v1.0/specification/examples/examples/17.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
- sense (id: better-safe-1)
- definition (text: you should be careful even if it seems unnecessary)
- relation (type: subentrying)
member (memberID: safe-1, role: container)
member (memberID: better-safe, role: subentry)
member (ref: safe-1, role: container)
member (ref: better-safe, role: subentry)
- relationType (type: subentrying, scopeRestriction: sameResource)
- memberType (role: container, type: sense, min: 1, max: 1, hint: navigate)
- memberType (role: subentry, type: entry, min: 1, max: 1, hint: embed)
Expand Down Expand Up @@ -56,8 +56,8 @@
&lt;/sense&gt;
&lt;/entry&gt;
&lt;relation type="subentrying"&gt;
&lt;member memberID="safe-1" role="container"/&gt;
&lt;member memberID="better-safe" role="subentry"/&gt;
&lt;member ref="safe-1" role="container"/&gt;
&lt;member ref="better-safe" role="subentry"/&gt;
&lt;/relation&gt;
&lt;relationType type="subentrying" scopeRestriction="sameResource"&gt;
&lt;memberType role="container" type="sense" min="1" max="1" hint="navigate"/&gt;
Expand Down Expand Up @@ -97,8 +97,8 @@
"relations": [{
"type": "subentrying",
"members": [
{"role": "container", "memberID": "safe-1"},
{"role": "subentry", "memberID": "better-safe"}
{"role": "container", "ref": "safe-1"},
{"role": "subentry", "ref": "better-safe"}
]
}],
"relationTypes": [{
Expand Down
12 changes: 6 additions & 6 deletions dmlex-v1.0/specification/examples/examples/18.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
- sense (id: bible-2)
- definition (text: a book considered important for a subject)
- relation (type: subentrying)
- member (memberID: bible-1, role: container)
- member (memberID: the-bible, role: subentry)
- member (ref: bible-1, role: container)
- member (ref: the-bible, role: subentry)
- relationType (type: subentrying, scopeRestcriction: sameResource)
- memberType (role: container, type: sense, min: 1, max: 1, hint: navigate)
- memberRole (role: subentry, type: entry, min: 1, max: 1, hint: embed)
Expand Down Expand Up @@ -53,8 +53,8 @@
&lt;/sense&gt;
&lt;/entry&gt;
&lt;relation type="subentrying"&gt;
&lt;member memberID="bible-1" role="container"/&gt;
&lt;member memberID="the-bible" role="subentry"/&gt;
&lt;member ref="bible-1" role="container"/&gt;
&lt;member ref="the-bible" role="subentry"/&gt;
&lt;/relation&gt;
&lt;relationType type="subentrying" scopeRestriction="sameResource"&gt;
&lt;memberType role="container" type="sense" min="1" max="1" hint="navigate"/&gt;
Expand Down Expand Up @@ -89,8 +89,8 @@
"relations": [{
"type": "subentrying",
"members": [
{"role": "container", "memberID": "bible-1"},
{"role": "subentry", "memberID": "the-bible"}
{"role": "container", "ref": "bible-1"},
{"role": "subentry", "ref": "the-bible"}
]
}],
"relationTypes": [{
Expand Down
13 changes: 7 additions & 6 deletions dmlex-v1.0/specification/modules/linking/objectTypes/member.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>memberID</literal>
<glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm> (in combination with other unique properties if present). Reference to an object, such as an entry or a
sense.</para>
<para><literal>ref</literal>
<glossterm>required</glossterm> (exactly one) and <glossterm>unique</glossterm> (in
combination with other unique properties if present). Reference to an object, such as an
entry or a sense.</para>
</listitem>
<listitem>
<para><literal>role</literal>
Expand Down Expand Up @@ -56,15 +57,15 @@
<example>
<title>XML</title>
<programlisting>
&lt;member memberID="..." role="..." obverseListingOrder="..."/&gt;
&lt;member ref="..." role="..." obverseListingOrder="..."/&gt;
</programlisting>
</example>

<example>
<title>JSON</title>
<programlisting>
{
"memberID": "...",
"ref": "...",
"role": "...",
"obverseListingOrder": "..."
}
Expand All @@ -75,7 +76,7 @@
<programlisting>
&lt;#relation&gt; dmlex:member [
a dmlex:Member ;
dmlex:memberID "..." ;
dmlex:ref "..." ;
dmlex:role "..." ;
dmlex:listingOrder 0 ;
dmlex:obverseListingOrder 0 ] .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<itemizedlist>
<title>Members</title>
<listitem>
<para><literal>"memberID"</literal>
<para><literal>"ref"</literal>
<glossterm>required</glossterm>, string</para>
</listitem>
<listitem>
Expand Down
3 changes: 2 additions & 1 deletion dmlex-v1.0/specification/serializations/NVH/nodes/member.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<itemizedlist>
<title>Value</title>
<listitem>
<para><literal>memberID</literal> <glossterm>required</glossterm></para>
<para><literal>ref</literal>
<glossterm>required</glossterm></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:memberID</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:ref</literal> REQUIRED (exactly 1) of type
<literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:obverseListingOrder</literal> OPTIONAL (at most 1) of type
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<itemizedlist>
<title>Attributes</title>
<listitem>
<para><literal>@memberID</literal> <glossterm>required</glossterm></para>
<para><literal>@ref</literal>
<glossterm>required</glossterm></para>
</listitem>
<listitem>
<para><literal>@role</literal> <glossterm>optional</glossterm></para>
Expand Down

0 comments on commit 246d4b6

Please sign in to comment.