copyright modelling: relaton/relaton-data-iho#4

relaton · Jun 1, 2020 · ce4fc30 · ce4fc30
1 parent 67594f4
commit ce4fc30
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/grammars/biblio.rnc b/grammars/biblio.rnc
@@ -258,7 +258,7 @@ BibliographicItem =
     fetched?,
     (btitle+ | formattedref), bsource*, docidentifier*, docnumber?, bdate*, contributor*,
     edition?, version?, biblionote*, language*, script*,
-    bibabstract*, status?, copyright?, docrelation*, series*, medium?, bplace*, bprice*,
+    bibabstract*, status?, copyright*, docrelation*, series*, medium?, bplace*, bprice*,
     extent*, accesslocation*, license*, bclassification*, bkeyword*, validity?
 
 btitle = element title { TypedTitleString }
@@ -368,9 +368,11 @@ bibabstract = element abstract { FormattedString }
 
 copyright =
   element copyright {
-    from, to?, owner+
+    from, to?, owner+, copyright_scope?
 }
 
+copyright_scope = element scope { text }
+
 from = element from { xsd:gYear }
 to = element to { xsd:gYear }
 

diff --git a/grammars/biblio.rng b/grammars/biblio.rng
@@ -661,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -1024,6 +1024,14 @@
       <oneOrMore>
         <ref name="owner"/>
       </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">

diff --git a/images/RelBib_BibliographicItem.png b/images/RelBib_BibliographicItem.png
diff --git a/models/RelBib_BibliographicItem.wsd b/models/RelBib_BibliographicItem.wsd
@@ -39,6 +39,7 @@ History of changes:
     - 20190619 refine medium, place
     - 20190708 refine medium
     - 20200411 add stage and substage abbreviations
+    - 20200601 copyright modelling
 '/
 
 '******* CONFIGURATION ************************************************
@@ -63,7 +64,7 @@ class BibliographicItem {
     +script: Iso15924Code[0..*]
     +abstract: FormattedString[0..*]
     +status: DocumentStatus[0..1]
-    +copyright: CopyrightAssociation[0..1]
+    +copyright: CopyrightAssociation[0..*]
     +relation: DocumentRelation[0..*]
     +series: SeriesType[0..*]
     +medium: MediumType[0..1]
@@ -105,6 +106,7 @@ class CopyrightAssociation{
     +from: DateTime
     +to: DateTime[0..1]
     +owner: Contributor[1..*]
+    +scope: String[0..1]
 }
 
 class MediumType{