diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-18 21:29:36 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-18 21:29:36 +0100 |
| commit | 5dfa2b6cba3e31d18e2cc23f05d330e387fc1a29 (patch) | |
| tree | 2f97711bd12bfdb35425c0ffaca5af6a231b8076 /data/domain | |
| parent | f6d3495b681e19227a5ea9ec081d36644be55d68 (diff) | |
| parent | 19e3e43e80e413d297ca8970d018eeda57ee65e1 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'data/domain')
| -rw-r--r-- | data/domain/bibliography.osxml | 33 | ||||
| -rw-r--r-- | data/domain/meta.osxml | 22 |
2 files changed, 36 insertions, 19 deletions
diff --git a/data/domain/bibliography.osxml b/data/domain/bibliography.osxml index 11e2606..5953e5f 100644 --- a/data/domain/bibliography.osxml +++ b/data/domain/bibliography.osxml @@ -12,16 +12,31 @@ <field name="bibliography" isSubtree="true"/> </parentRef> </struct> - <struct name="bibEntry"> - <primitive name="name" type="string" isSubtree="true"/> - <primitive name="year" type="int" isSubtree="true"/> - <primitive name="journal" type="string" isSubtree="true" optional="true"/> - <primitive name="pages" type="cardinality" isSubtree="true" optional="true"/> - <!-- Here a geographical enum or something would be more exact --> - <primitive name="location" type="string" isSubtree="true" optional="true"/> - <field name="authors" optional="true"> - <childRef ref="meta.author"/> + <field> + <childRef ref="meta.authors"/> + <childRef ref="title"/> + <childRef ref="year"/> + <childRef ref="journal"/> + <childRef ref="pages"/> + <childRef ref="location"/> </field> </struct> + <struct name="title" cardinality="{1}"> + <primitive type="string"/> + </struct> + <struct name="year" cardinality="{1}"> + <primitive type="int"/> + </struct> + <struct name="journal" cardinality="{0-1}"> + <!-- here some kind of database reference would be better --> + <primitive type="string"/> + </struct> + <struct name="pages" cardinality="{0-1}"> + <primitive type="cardinality"/> + </struct> + <struct name="location" cardinality="{0-1}"> + <!-- here some kind of database reference would be better --> + <primitive type="string"/> + </struct> </domain> diff --git a/data/domain/meta.osxml b/data/domain/meta.osxml index 7e96699..d214921 100644 --- a/data/domain/meta.osxml +++ b/data/domain/meta.osxml @@ -9,7 +9,6 @@ <struct name="meta" cardinality="{1}" transparent="true"> <field> - <childRef ref="title"/> <childRef ref="author"/> <childRef ref="version"/> </field> @@ -22,21 +21,24 @@ <!-- One could also include "article" and other things here --> </struct> - <!-- A title is just a heading --> - <struct name="title"> - <field> - <childRef ref="heading"/> - </field> - </struct> - - <!-- no explicit cardinality, because we might have multiple authors --> - <struct name="author"> + <struct name="person"> <primitive isSubtree="true" name="firstName" type="string"/> <primitive isSubtree="true" name="lastName" type="string"/> <primitive isSubtree="true" name="email" type="email" optional="true"/> <primitive isSubtree="true" name="affiliation" type="affiliation" optional="true"/> </struct> + <!-- wrapper author tag to allow specifying no authors whatsoever. But if + an author is specified it has to be at least one primary author. --> + <struct name="authors" transparent="true" cardinality="{0-1}"> + <field> + <childRef ref="author"/> + </field> + </struct> + + <!-- no explicit cardinality, because we might have multiple authors --> + <struct name="author" isa="person"/> + <!-- but we need at least one primary author --> <struct name="primaryAuthor" cardinality="{>0}" isa="author"/> |