diff --git a/dmlex-v1.0/specification/modules/etymology/extensions/sameAs.xml b/dmlex-v1.0/specification/modules/etymology/extensions/sameAs.xml new file mode 100644 index 00000000..2a924c28 --- /dev/null +++ b/dmlex-v1.0/specification/modules/etymology/extensions/sameAs.xml @@ -0,0 +1,31 @@ + + + %xinclude; + +]> + +
+ Extensions to <code>sameAs</code> + + Extends the sameAs object type + from the Controlled Values Module. + + + + Can additionally be a property of + + etymonLanguage + + + etymonType + + + + + Relational database + + + +
diff --git a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml index f4af4302..d0baafa1 100644 --- a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml +++ b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml @@ -44,11 +44,6 @@ etymonUnit required (one or more) and unique. - - translation - optional (zero or one). Normalised string. A translation or - gloss of the etymon in the language of the lexicographic resource. - listingOrder required (exactly one). Number. The position of this origin diff --git a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml index 39a60481..40527d2e 100644 --- a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml +++ b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml @@ -32,6 +32,10 @@ optional (zero or one). Normalised string. The name of the etymon language, in the language of the lexicographic resource. + + sameAs + optional (zero or more). + @@ -48,6 +52,7 @@ <etymonLanguage langCode="..."> <displayName>...<displayName> + <sameAs.../> </etymonLanguage> @@ -57,7 +62,8 @@ { "langCode": "..." , - "displayName": "..." + "displayName": "...", + "sameAs": [ ... ] } @@ -66,7 +72,8 @@ RDF <#etymonLanguage> dmlex:langCode "..." ; - dmlex:displayName "... " . + dmlex:displayName "... " ; + dmlex:sameAs ... . diff --git a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml index 058c0973..59f311a4 100644 --- a/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml +++ b/dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml @@ -31,6 +31,10 @@ optional (zero or one). Normalised string. A human-readable explanation of this type. + + sameAs + optional (zero or more). + diff --git a/dmlex-v1.0/specification/modules/etymology/specification.xml b/dmlex-v1.0/specification/modules/etymology/specification.xml index 0a9ee0af..52fc245c 100644 --- a/dmlex-v1.0/specification/modules/etymology/specification.xml +++ b/dmlex-v1.0/specification/modules/etymology/specification.xml @@ -20,5 +20,6 @@ + diff --git a/dmlex-v1.0/specification/schemas/JSON/dmlex.schema.json b/dmlex-v1.0/specification/schemas/JSON/dmlex.schema.json index 44d12930..a6115b1a 100644 --- a/dmlex-v1.0/specification/schemas/JSON/dmlex.schema.json +++ b/dmlex-v1.0/specification/schemas/JSON/dmlex.schema.json @@ -906,9 +906,6 @@ "$ref": "#/$defs/etymonUnit" }, "minItems": 1 - }, - "translation": { - "type": "string" } }, "additionalProperties": false @@ -950,6 +947,13 @@ "description": { "type": "string", "minLength": 1 + }, + "sameAs": { + "type": "array", + "items": { + "$ref": "#/$defs/sameAs" + }, + "uniqueItems": true } }, "additionalProperties": false @@ -963,6 +967,13 @@ }, "displayName": { "type": "string" + }, + "sameAs": { + "type": "array", + "items": { + "$ref": "#/$defs/sameAs" + }, + "uniqueItems": true } }, "additionalProperties": false diff --git a/dmlex-v1.0/specification/schemas/JSON/dmlex_no-crosslingual.schema.json b/dmlex-v1.0/specification/schemas/JSON/dmlex_no-crosslingual.schema.json index b1d6a488..1cc56bff 100644 --- a/dmlex-v1.0/specification/schemas/JSON/dmlex_no-crosslingual.schema.json +++ b/dmlex-v1.0/specification/schemas/JSON/dmlex_no-crosslingual.schema.json @@ -709,11 +709,7 @@ "$ref": "#/$defs/etymonUnit" }, "minItems": 1 - }, - "translation": { - "type": "string" - } - }, + } }, "additionalProperties": false }, "etymonUnit": { @@ -753,6 +749,13 @@ "description": { "type": "string", "minLength": 1 + }, + "sameAs": { + "type": "array", + "items": { + "$ref": "#/$defs/sameAs" + }, + "uniqueItems": true } }, "additionalProperties": false @@ -766,6 +769,13 @@ }, "displayName": { "type": "string" + }, + "sameAs": { + "type": "array", + "items": { + "$ref": "#/$defs/sameAs" + }, + "uniqueItems": true } }, "additionalProperties": false diff --git a/dmlex-v1.0/specification/schemas/RDF/dmlex-etymology.ttl b/dmlex-v1.0/specification/schemas/RDF/dmlex-etymology.ttl index ec7370d6..11776429 100644 --- a/dmlex-v1.0/specification/schemas/RDF/dmlex-etymology.ttl +++ b/dmlex-v1.0/specification/schemas/RDF/dmlex-etymology.ttl @@ -49,9 +49,6 @@ dmlex:Etymon a owl:Class ; a owl:Restriction ; owl:onProperty dmlex:etymonUnit ; owl:minCardinality 1 ] , [ - a owl:Restriction ; - owl:onProperty dmlex:translation ; - owl:maxCardinality 1 ] , [ a owl:Restriction ; owl:onProperty dmlex:listingOrder ; owl:cardinality 1 ] . @@ -140,3 +137,7 @@ dmlex:displayName a owl:ObjectProperty ; rdfs:label "Display Name"@en ; rdfs:domain dmlex:EtymonLanguage ; rdfs:range xsd:string . + + +dmlex:EtymonLanguage rdfs:subClassOf dmlex:HasSameAs . +dmlex:EtymonType rdfs:subClassOf dmlex:HasSameAs . diff --git a/dmlex-v1.0/specification/schemas/RDF/dmlex.ttl b/dmlex-v1.0/specification/schemas/RDF/dmlex.ttl index 6722cdfa..5abcb5ce 100644 --- a/dmlex-v1.0/specification/schemas/RDF/dmlex.ttl +++ b/dmlex-v1.0/specification/schemas/RDF/dmlex.ttl @@ -926,7 +926,6 @@ dmlex:translation a owl:DatatypeProperty ; rdfs:domain dmlex:HasTranslation ; rdfs:range xsd:string . -dmlex:Etymon rdfs:subClassOf dmlex:HasTranslation . dmlex:EtymonUnit rdfs:subClassOf dmlex:HasTranslation . dmlex:EtymonUnit a owl:Class ; @@ -990,3 +989,7 @@ dmlex:displayName a owl:ObjectProperty ; rdfs:label "Display Name"@en ; rdfs:domain dmlex:EtymonLanguage ; rdfs:range xsd:string . + +dmlex:EtymonLanguage rdfs:subClassOf dmlex:HasSameAs . +dmlex:EtymonType rdfs:subClassOf dmlex:HasSameAs . + diff --git a/dmlex-v1.0/specification/schemas/XML/dmlex.xsd b/dmlex-v1.0/specification/schemas/XML/dmlex.xsd index 4c0e774f..03b99044 100644 --- a/dmlex-v1.0/specification/schemas/XML/dmlex.xsd +++ b/dmlex-v1.0/specification/schemas/XML/dmlex.xsd @@ -642,7 +642,6 @@ It might be possible to re-write them as s using concatenation of values - @@ -667,6 +666,7 @@ It might be possible to re-write them as s using concatenation of values + @@ -676,6 +676,7 @@ It might be possible to re-write them as s using concatenation of values + diff --git a/dmlex-v1.0/specification/schemas/XML/dmlex_no-crosslingual.xsd b/dmlex-v1.0/specification/schemas/XML/dmlex_no-crosslingual.xsd index dd5dfa11..94caeea1 100644 --- a/dmlex-v1.0/specification/schemas/XML/dmlex_no-crosslingual.xsd +++ b/dmlex-v1.0/specification/schemas/XML/dmlex_no-crosslingual.xsd @@ -527,7 +527,6 @@ It might be possible to re-write them as s using concatenation of values - @@ -552,6 +551,7 @@ It might be possible to re-write them as s using concatenation of values + @@ -561,6 +561,7 @@ It might be possible to re-write them as s using concatenation of values + diff --git a/dmlex-v1.0/specification/serializations/JSON/objects/etymon.xml b/dmlex-v1.0/specification/serializations/JSON/objects/etymon.xml index c0590343..ff24b0b8 100644 --- a/dmlex-v1.0/specification/serializations/JSON/objects/etymon.xml +++ b/dmlex-v1.0/specification/serializations/JSON/objects/etymon.xml @@ -29,10 +29,6 @@ required, array of one or more etymonUnit instances - - "translation" - optional, string - diff --git a/dmlex-v1.0/specification/serializations/JSON/objects/etymonLanguage.xml b/dmlex-v1.0/specification/serializations/JSON/objects/etymonLanguage.xml index 4b3df787..096d49b0 100644 --- a/dmlex-v1.0/specification/serializations/JSON/objects/etymonLanguage.xml +++ b/dmlex-v1.0/specification/serializations/JSON/objects/etymonLanguage.xml @@ -20,6 +20,11 @@ "displayName" optional, string + + "sameAs" + optional, array of zero or more strings implementing the + sameAs object type + diff --git a/dmlex-v1.0/specification/serializations/JSON/objects/etymonType.xml b/dmlex-v1.0/specification/serializations/JSON/objects/etymonType.xml index 8bcca2fb..5dcadfc8 100644 --- a/dmlex-v1.0/specification/serializations/JSON/objects/etymonType.xml +++ b/dmlex-v1.0/specification/serializations/JSON/objects/etymonType.xml @@ -20,6 +20,11 @@ "description" optional, string + + "sameAs" + optional, array of zero or more strings implementing the + sameAs object type + diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml index 0b7d9686..6e316279 100644 --- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml +++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml @@ -23,9 +23,6 @@ etymonUnit required (one or more) - - translation optional (zero or one) - diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml index b5711bb6..e55a9482 100644 --- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml +++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml @@ -21,6 +21,9 @@ displayName optional (zero or one) + + sameAs optional (zero or more) + diff --git a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml index bdbdfa2e..ba030241 100644 --- a/dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml +++ b/dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml @@ -21,6 +21,9 @@ description optional (zero or one) + + sameAs optional (zero or more) + diff --git a/dmlex-v1.0/specification/serializations/RDB/tables/etymons.xml b/dmlex-v1.0/specification/serializations/RDB/tables/etymons.xml index 24fdb7e0..3fafc6b7 100644 --- a/dmlex-v1.0/specification/serializations/RDB/tables/etymons.xml +++ b/dmlex-v1.0/specification/serializations/RDB/tables/etymons.xml @@ -32,9 +32,6 @@ note: nvarchar - - translation: nvarchar - listingOrder: int diff --git a/dmlex-v1.0/specification/serializations/RDF/elements/Etymon.xml b/dmlex-v1.0/specification/serializations/RDF/elements/Etymon.xml index f4f75ad6..89918f15 100644 --- a/dmlex-v1.0/specification/serializations/RDF/elements/Etymon.xml +++ b/dmlex-v1.0/specification/serializations/RDF/elements/Etymon.xml @@ -28,10 +28,7 @@ dmlex:etymonUnit REQUIRED (at least 1) reference to EtymonUnit - - dmlex:translation OPTIONAL (at most 1) of type http://www.w3.org/2001/XMLSchema#string - - \ No newline at end of file + diff --git a/dmlex-v1.0/specification/serializations/RDF/elements/EtymonLanguage.xml b/dmlex-v1.0/specification/serializations/RDF/elements/EtymonLanguage.xml index 32e0fd50..462b8273 100644 --- a/dmlex-v1.0/specification/serializations/RDF/elements/EtymonLanguage.xml +++ b/dmlex-v1.0/specification/serializations/RDF/elements/EtymonLanguage.xml @@ -19,7 +19,10 @@ dmlex:displayName OPTIONAL (at most 1) of type http://www.w3.org/2001/XMLSchema#string + + dmlex:sameAs OPTIONAL + - \ No newline at end of file + diff --git a/dmlex-v1.0/specification/serializations/RDF/elements/EtymonType.xml b/dmlex-v1.0/specification/serializations/RDF/elements/EtymonType.xml index 91d59df3..950dd92a 100644 --- a/dmlex-v1.0/specification/serializations/RDF/elements/EtymonType.xml +++ b/dmlex-v1.0/specification/serializations/RDF/elements/EtymonType.xml @@ -19,7 +19,10 @@ dmlex:type REQUIRED (exactly 1) of type http://www.w3.org/2001/XMLSchema#string + + dmlex:sameAs OPTIONAL + - \ No newline at end of file + diff --git a/dmlex-v1.0/specification/serializations/XML/elements/etymon.xml b/dmlex-v1.0/specification/serializations/XML/elements/etymon.xml index edbf323b..c4041fe1 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/etymon.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/etymon.xml @@ -27,9 +27,6 @@ <etymonUnit> required (one or more) - - <translation> optional (zero or one) - diff --git a/dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml b/dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml index 95d28370..a4cf3386 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml @@ -21,6 +21,9 @@ <displayName> optional (zero or one) + + <sameAs> optional (zero or more) + diff --git a/dmlex-v1.0/specification/serializations/XML/elements/etymonType.xml b/dmlex-v1.0/specification/serializations/XML/elements/etymonType.xml index 8bc8f058..bed07120 100644 --- a/dmlex-v1.0/specification/serializations/XML/elements/etymonType.xml +++ b/dmlex-v1.0/specification/serializations/XML/elements/etymonType.xml @@ -21,6 +21,9 @@ <description> optional (zero or one) + + <sameAs> optional (zero or more) +