Makefile

@@ -15,7 +15,7 @@ all: build/mkdocs-site
 
 build/linkml-docs: \
 	build/linkml-docs/s/base/unreleased \
-	build/linkml-docs/s/flatentry/unreleased
+	build/linkml-docs/s/simpleinput/unreleased
 build/linkml-docs/s/%: src/%.yaml src/%/extra-docs
 	gen-doc \
 		--hierarchical-class-view \
@@ -53,7 +53,7 @@ check: check-models check-validation
 # add additional schemas to lint here
 check-models: \
 	checkmodel/base/unreleased \
-	checkmodel/flatentry/unreleased
+	checkmodel/simpleinput/unreleased
 checkmodel/%: src/%.yaml
 	@echo [Check $<]
 	@echo "Run linter"
@@ -83,8 +83,8 @@ checkmodel/%: src/%.yaml
 check-validation: \
 	convertexamples/base/unreleased \
 	checkvalidation/base/unreleased \
-	convertexamples/flatentry/unreleased \
+	convertexamples/simpleinput/unreleased \
-	checkvalidation/flatentry/unreleased
+	checkvalidation/simpleinput/unreleased
 checkvalidation/%:
 	$(MAKE) checkvalid/$* checkinvalid/$*
 checkvalid/%: src/%/validation src/%.yaml
@@ -100,7 +100,7 @@ checkinvalid/%: src/%/validation src/%.yaml
 
 convert-examples: \
 	convertexamples/base/unreleased \
-	convertexamples/flatentry/unreleased
+	convertexamples/simpleinput/unreleased
 convertexamples/%: src/%.yaml src/%/examples
 	# loop over all examples, skip the schema file itself
 	for ex in $^/*.yaml; do \

extra-docs/index.md

@@ -1,7 +1,7 @@
 ALL CONTENT HERE IS UNRELEASED AND MAY CHANGE ANY TIME
 
 - [Base schema](s/base/unreleased/index.md)
-- [Flat entry schema](s/flatentry/unreleased/index.md)
+- [Flat entry schema](s/simpleinput/unreleased/index.md)
 
 
 [Browse the sources](https://hub.psychoinformatics.de/inm7/inm7-concepts)

mkdocs.yml

@@ -5,7 +5,7 @@ nav:
   - About: about.md
   - Schemas:
     - Base (unreleased): s/base/unreleased/index.md
-    - Flat entry (unreleased): s/flatentry/unreleased/index.md
+    - Flat entry (unreleased): s/simpleinput/unreleased/index.md
 plugins:
   - mermaid2
   - panzoom:
@@ -14,7 +14,7 @@ plugins:
       redirect_maps:
           # map unversioned URLs to the latest version
           's/base/index.md': 's/base/unreleased/index.md'
-          's/flatentry/index.md': 's/flatentry/unreleased/index.md'
+          's/simpleinput/index.md': 's/simpleinput/unreleased/index.md'
   - search
 site_author: PsyInf group at INM-7
 site_description:

src/simpleinput/unreleased.yaml

@@ -1,5 +1,5 @@
-id: https://concepts.inm7.de/s/flatentry/unreleased
+id: https://concepts.inm7.de/s/simpleinput/unreleased
-name: inm7-flatentry-schema
+name: inm7-simpleinput-schema
 version: UNRELEASED
 status: eunal:concept-status/DRAFT
 title: INM7 simplified data models for manual metadata entry
@@ -29,7 +29,7 @@ prefixes:
   dlthings: https://concepts.datalad.org/s/things/v1/
   dltypes: https://concepts.datalad.org/s/types/unreleased/
   eunal: http://publications.europa.eu/resource/authority/
-  inm7flatentry: https://concepts.inm7.de/s/flatentry/unreleased/
+  inm7si: https://concepts.inm7.de/s/simpleinput/unreleased/
   inm7: https://inm7.de/ns/
   linkml: https://w3id.org/linkml/
   orcid: https://orcid.org/
@@ -41,7 +41,7 @@ prefixes:
   w3ctr: https://www.w3.org/TR/
   xsd: http://www.w3.org/2001/XMLSchema#
 
-default_prefix: inm7flatentry
+default_prefix: inm7si
 
 emit_prefixes:
   - dlthings
@@ -175,9 +175,9 @@ slots:
     range: string
 
 classes:
-  FlatEntryHelper:
+  CurationAid:
-    class_uri: inm7flatentry:FlatEntryHelper
+    class_uri: inm7si:CurationAid
-    is_a: Thing
+    mixin: true
     description: >-
       Technical helper providing curation-related slots.
     slots:
@@ -185,8 +185,10 @@ classes:
       - display_name
 
   Person:
-    class_uri: inm7flatentry:Person
+    class_uri: inm7si:Person
-    is_a: FlatEntryHelper
+    is_a: Thing
+    mixins:
+      - CurationAid
     description: >-
       A person.
     slots:
@@ -202,45 +204,47 @@ classes:
         recommended: true
         annotations:
           sh:name: Family name
-          sh:group: inm7flatentry:PersonPropertyGroup
+          sh:group: inm7si:PersonPropertyGroup
           sh:order: 1
       given_name:
         recommended: true
         annotations:
           sh:name: Given name
-          sh:group: inm7flatentry:PersonPropertyGroup
+          sh:group: inm7si:PersonPropertyGroup
           sh:order: 2
       additional_names:
         annotations:
           sh:name: Additional names
-          sh:group: inm7flatentry:PersonPropertyGroup
+          sh:group: inm7si:PersonPropertyGroup
           sh:order: 3
       honorific_name_prefix:
         annotations:
           sh:name: Title or prefix
-          sh:group: inm7flatentry:PersonPropertyGroup
+          sh:group: inm7si:PersonPropertyGroup
           sh:order: 4
       honorific_name_suffix:
         annotations:
           sh:name: Suffix
-          sh:group: inm7flatentry:PersonPropertyGroup
+          sh:group: inm7si:PersonPropertyGroup
           sh:order: 5
       emails:
         recommended: true
         annotations:
           sh:name: Email(s)
-          sh:group: inm7flatentry:PersonPropertyGroup
+          sh:group: inm7si:PersonPropertyGroup
           sh:order: 6
       orcid:
         recommended: true
         annotations:
           sh:name: ORCID
-          sh:group: inm7flatentry:PersonPropertyGroup
+          sh:group: inm7si:PersonPropertyGroup
           sh:order: 7
 
   Journal:
-    class_uri: inm7flatentry:Journal
+    class_uri: inm7si:Journal
-    is_a: FlatEntryHelper
+    is_a: Thing
+    mixins:
+      - CurationAid
     description: >-
       A periodical that publishes (peer-reviewed) academic articles.
     slots:
@@ -252,23 +256,25 @@ classes:
         required: true
         annotations:
           sh:name:  Title
-          sh:group: inm7flatentry:JournalPropertyGroup
+          sh:group: inm7si:JournalPropertyGroup
           sh:order: 1
       short_name:
         annotations:
           sh:name:  Short name
-          sh:group: inm7flatentry:JournalPropertyGroup
+          sh:group: inm7si:JournalPropertyGroup
           sh:order: 2
       issn:
         recommended: true
         annotations:
           sh:name:  ISSN
-          sh:group: inm7flatentry:JournalPropertyGroup
+          sh:group: inm7si:JournalPropertyGroup
           sh:order: 3
 
   JournalArticle:
-    class_uri: inm7flatentry:JournalArticle
+    class_uri: inm7si:JournalArticle
-    is_a: FlatEntryHelper
+    is_a: Thing
+    mixins:
+      - CurationAid
     description: >-
       A report that is published in a journal.
     slots:
@@ -282,26 +288,26 @@ classes:
         required: true
         annotations:
           sh:name:  Title
-          sh:group: inm7flatentry:JournalArticlPropertyGroup
+          sh:group: inm7si:JournalArticlPropertyGroup
           sh:order: 1
       doi:
         recommended: true
         annotations:
           sh:name: Digital Object Identifier
-          sh:group: inm7flatentry:JournalArticlePropertyGroup
+          sh:group: inm7si:JournalArticlePropertyGroup
           sh:order: 2
       authors:
         annotations:
           sh:name: Author(s)
-          sh:group: inm7flatentry:JournalArticlePropertyGroup
+          sh:group: inm7si:JournalArticlePropertyGroup
           sh:order: 3
       journal:
         annotations:
           sh:name: Journal
-          sh:group: inm7flatentry:JournalArticlePropertyGroup
+          sh:group: inm7si:JournalArticlePropertyGroup
           sh:order: 4
       date_published:
         annotations:
           sh:name: Date published
-          sh:group: inm7flatentry:JournalArticlePropertyGroup
+          sh:group: inm7si:JournalArticlePropertyGroup
           sh:order: 5

src/simpleinput/unreleased/examples/Journal-typical.json

@@ -1,6 +1,6 @@
 {
   "pid": "https://urn.issn.org/urn/issn:0027-8424",
-  "schema_type": "inm7flatentry:Journal",
+  "schema_type": "inm7si:Journal",
   "title": "Proceedings of the National Academy of Sciences of the United States of America",
   "issn": "0027-8424",
   "short_name": "PNAS",

src/simpleinput/unreleased/examples/JournalArticle-typical.json

@@ -1,6 +1,6 @@
 {
   "pid": "https://doi.org/10.1038/s41597-022-01163-2",
-  "schema_type": "inm7flatentry:JournalArticle",
+  "schema_type": "inm7si:JournalArticle",
   "title": "FAIRly big: A framework for computationally reproducible processing of large-scale data",
   "doi": "10.1038/s41597-022-01163-2",
   "authors": [

src/simpleinput/unreleased/examples/Person-names.json

@@ -1,6 +1,6 @@
 {
   "pid": "inm7:persons/zorro",
-  "schema_type": "inm7flatentry:Person",
+  "schema_type": "inm7si:Person",
   "additional_names": [
     "Zorro"
   ],

src/simpleinput/unreleased/examples/Person-props.json

@@ -1,6 +1,6 @@
 {
   "pid": "https://orcid.org/0000-0001-6398-6370",
-  "schema_type": "inm7flatentry:Person",
+  "schema_type": "inm7si:Person",
   "emails": [
     "m.hanke@fz-juelich.de"
   ],

src/simpleinput/unreleased/validation/Journal.valid.cfg.yaml

@@ -1,7 +1,7 @@
-schema: src/flatentry/unreleased.yaml
+schema: src/simpleinput/unreleased.yaml
 target_class: Journal
 data_sources:
-  - src/flatentry/unreleased/examples/Journal-typical.yaml
+  - src/simpleinput/unreleased/examples/Journal-typical.yaml
 plugins:
   JsonschemaValidationPlugin:
     closed: true

src/simpleinput/unreleased/validation/JournalArticle.valid.cfg.yaml

@@ -1,7 +1,7 @@
-schema: src/flatentry/unreleased.yaml
+schema: src/simpleinput/unreleased.yaml
 target_class: JournalArticle
 data_sources:
-  - src/flatentry/unreleased/examples/JournalArticle-typical.yaml
+  - src/simpleinput/unreleased/examples/JournalArticle-typical.yaml
 plugins:
   JsonschemaValidationPlugin:
     closed: true

src/simpleinput/unreleased/validation/Person.valid.cfg.yaml

@@ -1,8 +1,8 @@
-schema: src/flatentry/unreleased.yaml
+schema: src/simpleinput/unreleased.yaml
 target_class: Person
 data_sources:
-  - src/flatentry/unreleased/examples/Person-names.yaml
+  - src/simpleinput/unreleased/examples/Person-names.yaml
-  - src/flatentry/unreleased/examples/Person-props.yaml
+  - src/simpleinput/unreleased/examples/Person-props.yaml
 plugins:
   JsonschemaValidationPlugin:
     closed: true