Skip to content

Commit

Permalink
Merge branch 'master-rdmo2.x' into improve-options
Browse files Browse the repository at this point in the history
  • Loading branch information
Zack-83 committed Jun 25, 2024
2 parents d5dc2f8 + 7980972 commit 901933b
Show file tree
Hide file tree
Showing 15 changed files with 3,145 additions and 3,489 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ For problems or bugs with the RDMO Software, please use the issues in the [rdmo]
|Hessen State |[catalog](shared/HeFDI/4_hefdi_template_questions_1.4.xml)||2020-07|HeFDI|
|Horizon 2020 |[catalog](shared/ub_fau_erlangen_nuernberg/h2020-ehum/ehum_h2020_fragebogen.xml)|[view](shared/ub_fau_erlangen_nuernberg/h2020-ehum/views_h2020.xml)|2020-09|FDM Bayern eHumanities|
|Mathematics |[catalog](shared/MATH+/mathplus_questions.xml) ||2022-11|DFG Excellence Cluster MATH+|
|Mechanical Engineering |[catalog](shared/nfdi4ing/rdmo_mechanical_engineering/catalog_mb_20190124.xml)||2023-06|NFDI4Ing|
|Research data policy generator|[catalog](shared/FDNext/) ||2024-03|FDNext|
|Mechanical Engineering |[catalog](shared/nfdi4ing) ||2023-06|NFDI4Ing|
|Research data policy generator|[catalog](shared/FDNext/) ||2024-03|FDNext |
|VW Foundation - Science Europe|[catalog](shared/ub_fau_erlangen_nuernberg/ScienceEurope_VW_Stiftung/catalog_VW_SE.xml)||2021-04|FDM Bayern eHumanities|

Total: 34 catalogs, 15 views
102 changes: 51 additions & 51 deletions rdmorganiser/domain/attributes.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rdmorganiser/options/optionsets.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2024-03-12T11:33:03.227757+01:00" version="2.1.3">
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2024-03-12T11:33:03.227757+01:00" version="2.0.0">
<optionset dc:uri="https://rdmorganiser.github.io/terms/options/access_authentication">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<uri_path>access_authentication</uri_path>
Expand Down
Binary file removed shared/fodako/Dokumentation5.1.pdf
Binary file not shown.
Binary file added shared/fodako/Dokumentation5.2.docx
Binary file not shown.
Binary file added shared/fodako/Dokumentation5.2.pdf
Binary file not shown.
66 changes: 66 additions & 0 deletions shared/fodako/attributes-FoDaKo-dfg.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2024-06-05T09:18:33.791088+02:00">
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/deletion">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>deletion</key>
<path>project/dataset/deletion</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/deletion/reasons">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>reasons</key>
<path>project/dataset/deletion/reasons</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/deletion"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/deletion/technique">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>technique</key>
<path>project/dataset/deletion/technique</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/deletion"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/consent/content">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>content</key>
<path>project/dataset/sensitive_data/personal_data/consent/content</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/consent"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/consent/how_obtained">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>how_obtained</key>
<path>project/dataset/sensitive_data/personal_data/consent/how_obtained</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/consent"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/protection_concept">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>protection_concept</key>
<path>project/dataset/sensitive_data/personal_data/protection_concept</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/protection_concept/checked">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>checked</key>
<path>project/dataset/sensitive_data/personal_data/protection_concept/checked</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/protection_concept"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/protection_concept/rights_management">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>rights_management</key>
<path>project/dataset/sensitive_data/personal_data/protection_concept/rights_management</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/protection_concept"/>
</attribute>
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/protection_concept/workflow">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>workflow</key>
<path>project/dataset/sensitive_data/personal_data/protection_concept/workflow</path>
<dc:comment>Added for the FoDaKo DFG DMP templates, version 5.1</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/protection_concept"/>
</attribute>
</rdmo>
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2023-11-10T13:21:15.950246+01:00">
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2024-05-17T16:38:21.242675+02:00" version="2.1.3">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/confidentiality">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>confidentiality</key>
<path>confidentiality</path>
<dc:comment/>
<parent/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset/data_security/transfer">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>transfer</key>
<path>project/dataset/data_security/transfer</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/data_security"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset/preservation/embargo_length">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset_generated">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>embargo_length</key>
<path>project/dataset/preservation/embargo_length</path>
<key>dataset_generated</key>
<path>project/dataset_generated</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/preservation"/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset/preservation/access_protocol">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
Expand All @@ -21,6 +28,20 @@
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/preservation"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset/preservation/embargo_length">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>embargo_length</key>
<path>project/dataset/preservation/embargo_length</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/preservation"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset_reused">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dataset_reused</key>
<path>project/dataset_reused</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset/sensitive_data/documentation">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>documentation</key>
Expand All @@ -42,24 +63,24 @@
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/sensitive_data_description">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/id">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>sensitive_data_description</key>
<path>project/other_research_output/sensitive_data_description</path>
<key>id</key>
<path>project/other_research_output/id</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/security_transfer">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/preservation_criteria">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>security_transfer</key>
<path>project/other_research_output/security_transfer</path>
<key>preservation_criteria</key>
<path>project/other_research_output/preservation_criteria</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/storage_type">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/preservation_repository">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>storage_type</key>
<path>project/other_research_output/storage_type</path>
<key>preservation_repository</key>
<path>project/other_research_output/preservation_repository</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
Expand All @@ -70,32 +91,32 @@
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/preservation_criteria">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/reuse_existing">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>preservation_criteria</key>
<path>project/other_research_output/preservation_criteria</path>
<dc:comment/>
<key>reuse_existing</key>
<path>project/other_research_output/reuse_existing</path>
<dc:comment>Added for the purpose of stating the reasons &quot;if re-use of any existing data has been considered but discarded&quot;. EU Horizon Europe requires suggestions concerning this question, see Horizon Europe Data Management Plan Template, 05.05.2021, https://ec.europa.eu/info/funding-tenders/opportunities/docs/2021-2027/horizon/temp-form/report/data-management-plan-template_he_en.docx</dc:comment>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/title">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/security_ethics">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>title</key>
<path>project/other_research_output/title</path>
<key>security_ethics</key>
<path>project/other_research_output/security_ethics</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/preservation_repository">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/security_transfer">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>preservation_repository</key>
<path>project/other_research_output/preservation_repository</path>
<key>security_transfer</key>
<path>project/other_research_output/security_transfer</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/reuse_existing">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/sensitive_data_description">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>reuse_existing</key>
<path>project/other_research_output/reuse_existing</path>
<dc:comment>Added for the purpose of stating the reasons &quot;if re-use of any existing data has been considered but discarded&quot;. EU Horizon Europe requires suggestions concerning this question, see Horizon Europe Data Management Plan Template, 05.05.2021, https://ec.europa.eu/info/funding-tenders/opportunities/docs/2021-2027/horizon/temp-form/report/data-management-plan-template_he_en.docx</dc:comment>
<key>sensitive_data_description</key>
<path>project/other_research_output/sensitive_data_description</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/sharing_conditions">
Expand All @@ -105,39 +126,18 @@
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/security_ethics">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/storage_type">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>security_ethics</key>
<path>project/other_research_output/security_ethics</path>
<key>storage_type</key>
<path>project/other_research_output/storage_type</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/id">
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/other_research_output/title">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>id</key>
<path>project/other_research_output/id</path>
<key>title</key>
<path>project/other_research_output/title</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/other_research_output"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset_generated">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dataset_generated</key>
<path>project/dataset_generated</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/project/dataset_reused">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dataset_reused</key>
<path>project/dataset_reused</path>
<dc:comment/>
<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project"/>
</attribute>
<attribute dc:uri="https://dmp.metrology-rdm.eu/terms/domain/confidentiality">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>confidentiality</key>
<path>confidentiality</path>
<dc:comment/>
<parent/>
</attribute>
</rdmo>
32 changes: 7 additions & 25 deletions shared/metrology-rdm/epm-conditions.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2023-11-10T13:20:05.953776+01:00">
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2024-05-17T16:38:35.779368+02:00" version="2.1.3">
<condition dc:uri="https://dmp.metrology-rdm.eu/terms/conditions/dataset_created">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dataset_created</key>
<uri_path>dataset_created</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/provenance/content"/>
<relation>eq</relation>
Expand All @@ -11,43 +11,25 @@
</condition>
<condition dc:uri="https://dmp.metrology-rdm.eu/terms/conditions/dataset_reused">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dataset_reused</key>
<uri_path>dataset_reused</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/provenance/content"/>
<relation>eq</relation>
<target_text/>
<target_option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_origin_options/147"/>
</condition>
<condition dc:uri="https://dmp.metrology-rdm.eu/terms/conditions/dmp_final">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dmp_final</key>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dmp/dmp_version"/>
<relation>eq</relation>
<target_text/>
<target_option dc:uri="https://dmp.metrology-rdm.eu/terms/options/DMP_version/end"/>
</condition>
<condition dc:uri="https://dmp.metrology-rdm.eu/terms/conditions/dmp_initial">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dmp_initial</key>
<uri_path>dmp_initial</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dmp/dmp_version"/>
<relation>eq</relation>
<target_text/>
<target_option dc:uri="https://dmp.metrology-rdm.eu/terms/options/DMP_version/beginning"/>
</condition>
<condition dc:uri="https://dmp.metrology-rdm.eu/terms/conditions/dmp_midterm">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dmp_midterm</key>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dmp/dmp_version"/>
<relation>eq</relation>
<target_text/>
<target_option dc:uri="https://dmp.metrology-rdm.eu/terms/options/DMP_version/midterm"/>
</condition>
<condition dc:uri="https://dmp.metrology-rdm.eu/terms/conditions/dmp_not_initial">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>dmp_not_initial</key>
<uri_path>dmp_not_initial</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dmp/dmp_version"/>
<relation>neq</relation>
Expand All @@ -56,7 +38,7 @@
</condition>
<condition dc:uri="https://dmp.metrology-rdm.eu/terms/conditions/repository_ptb_oar">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>repository_ptb_oar</key>
<uri_path>repository_ptb_oar</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/preservation/repository"/>
<relation>eq</relation>
Expand All @@ -65,7 +47,7 @@
</condition>
<condition dc:uri="https://dmp.metrology-rdm.eu/terms/conditions/repository_zenodo">
<uri_prefix>https://dmp.metrology-rdm.eu/terms</uri_prefix>
<key>repository_zenodo</key>
<uri_path>repository_zenodo</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/preservation/repository"/>
<relation>eq</relation>
Expand Down
Loading

0 comments on commit 901933b

Please sign in to comment.