Skip to content

Commit

Permalink
Merge branch 'master-rdmo2.x' into full-exports
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zack-83
Zack-83 committed Jun 25, 2024
2 parents 48e9fb5 + 3725b3d commit dd1f888
Show file tree
Hide file tree
Showing 15 changed files with 3,185 additions and 3,529 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
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
View file

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions rdmorganiser/options/optionsets.xml
View file
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 Expand Up @@ -1793,19 +1793,19 @@
<uri_path>dataset_license_types/71</uri_path>
<dc:comment>https://creativecommons.org/licenses/by/4.0/legalcode</dc:comment>
<text lang="en">Creative Commons Attribution (CC-BY)</text>
<help lang="en"/>
<help lang="en">https://creativecommons.org/licenses/by/4.0/legalcode.en</help>
<view_text lang="en"/>
<text lang="de">Creative Commons Namensnennung (CC-BY)</text>
<help lang="de"/>
<help lang="de">https://creativecommons.org/licenses/by/4.0/legalcode.de</help>
<view_text lang="de"/>
<text lang="fr">Creative Commons Attribution (CC-BY)</text>
<help lang="fr"/>
<help lang="fr">https://creativecommons.org/licenses/by/4.0/legalcode.fr</help>
<view_text lang="fr"/>
<text lang="it">Creative Commons Attribuzione (CC-BY)</text>
<help lang="it"/>
<help lang="it">https://creativecommons.org/licenses/by/4.0/legalcode.it</help>
<view_text lang="it"/>
<text lang="es">Creative Commons Atribución/Reconocimiento (CC-BY)</text>
<help lang="es"/>
<help lang="es">https://creativecommons.org/licenses/by/4.0/legalcode.es</help>
<view_text lang="es"/>
<additional_input/>
</option>
Expand All @@ -1814,19 +1814,19 @@
<uri_path>dataset_license_types/73</uri_path>
<dc:comment>https://creativecommons.org/licenses/by-nc/4.0/legalcode</dc:comment>
<text lang="en">Creative Commons Attribution-NonCommercial (CC-BY-NC)</text>
<help lang="en"/>
<help lang="en">https://creativecommons.org/licenses/by-nc/4.0/legalcode.en</help>
<view_text lang="en"/>
<text lang="de">Creative Commons Namensnennung-Nicht kommerziell (CC-BY-NC)</text>
<help lang="de"/>
<help lang="de">https://creativecommons.org/licenses/by-nc/4.0/legalcode.de</help>
<view_text lang="de"/>
<text lang="fr">Creative Commons Attribution - Utilisation non commerciale (CC-BY-NC)</text>
<help lang="fr"/>
<help lang="fr">https://creativecommons.org/licenses/by-nc/4.0/legalcode.fr</help>
<view_text lang="fr"/>
<text lang="it">Creative Commons Attribuzione-NonCommerciale (CC-BY-NC)</text>
<help lang="it"/>
<help lang="it">https://creativecommons.org/licenses/by-nc/4.0/legalcode.it</help>
<view_text lang="it"/>
<text lang="es">Creative Commons Atribución/Reconocimiento-NoComercial (CC-BY-NC)</text>
<help lang="es"/>
<help lang="es">https://creativecommons.org/licenses/by-nc/4.0/legalcode.es</help>
<view_text lang="es"/>
<additional_input/>
</option>
Expand All @@ -1835,19 +1835,19 @@
<uri_path>dataset_license_types/74</uri_path>
<dc:comment>https://creativecommons.org/licenses/by-nd/4.0/legalcode</dc:comment>
<text lang="en">Creative Commons Attribution-NoDerivatives (CC-BY-ND)</text>
<help lang="en"/>
<help lang="en">https://creativecommons.org/licenses/by-nd/4.0/legalcode.en</help>
<view_text lang="en"/>
<text lang="de">Creative Commons Namensnennung-Keine Bearbeitungen (CC-BY-ND)</text>
<help lang="de"/>
<help lang="de">https://creativecommons.org/licenses/by-nd/4.0/legalcode.de</help>
<view_text lang="de"/>
<text lang="fr">Creative Commons Attribution - Pas d'Œuvre dérivée (CC-BY-ND)</text>
<help lang="fr"/>
<help lang="fr">https://creativecommons.org/licenses/by-nd/4.0/legalcode.fr</help>
<view_text lang="fr"/>
<text lang="it">Creative Commons Attribuzione-NonOpereDerivate (CC-BY-ND)</text>
<help lang="it"/>
<help lang="it">https://creativecommons.org/licenses/by-nd/4.0/legalcode.it</help>
<view_text lang="it"/>
<text lang="es">Creative Commons Atribución/Reconocimiento-SinDerivados (CC-BY-ND)</text>
<help lang="es"/>
<help lang="es">https://creativecommons.org/licenses/by-nd/4.0/legalcode.es</help>
<view_text lang="es"/>
<additional_input/>
</option>
Expand All @@ -1856,19 +1856,19 @@
<uri_path>dataset_license_types/75</uri_path>
<dc:comment>https://creativecommons.org/licenses/by-sa/4.0/legalcode</dc:comment>
<text lang="en">Creative Commons Attribution-ShareAlike (CC-BY-SA)</text>
<help lang="en"/>
<help lang="en">https://creativecommons.org/licenses/by-sa/4.0/legalcode.en</help>
<view_text lang="en"/>
<text lang="de">Creative Commons Namensnennung-ShareAlike (CC-BY-SA)</text>
<help lang="de"/>
<help lang="de">https://creativecommons.org/licenses/by-sa/4.0/legalcode.de</help>
<view_text lang="de"/>
<text lang="fr">Creative Commons Attribution - Partage dans les mêmes conditions (CC-BY-SA)</text>
<help lang="fr"/>
<help lang="fr">https://creativecommons.org/licenses/by-sa/4.0/legalcode.fr</help>
<view_text lang="fr"/>
<text lang="it">Creative Commons Attribuzione-CondividiAlloStessoModo (CC-BY-SA)</text>
<help lang="it"/>
<help lang="it">https://creativecommons.org/licenses/by-sa/4.0/legalcode.it</help>
<view_text lang="it"/>
<text lang="es">Creative Commons Atribución/Reconocimiento-CompartirIgual (CC-BY-SA)</text>
<help lang="es"/>
<help lang="es">https://creativecommons.org/licenses/by-sa/4.0/legalcode.es</help>
<view_text lang="es"/>
<additional_input/>
</option>
Expand All @@ -1877,19 +1877,19 @@
<uri_path>dataset_license_types/ODC-By</uri_path>
<dc:comment>https://opendatacommons.org/licenses/by/1-0/</dc:comment>
<text lang="en">Open Data Commons Attribution</text>
<help lang="en"/>
<help lang="en">https://opendatacommons.org/licenses/by/1-0/</help>
<view_text lang="en"/>
<text lang="de">Open Data Commons Attribution</text>
<help lang="de"/>
<help lang="de">https://opendatacommons.org/licenses/by/1-0/</help>
<view_text lang="de"/>
<text lang="fr">Open Data Commons Attribution</text>
<help lang="fr"/>
<help lang="fr">https://opendatacommons.org/licenses/by/1-0/</help>
<view_text lang="fr"/>
<text lang="it">Open Data Commons Attribution</text>
<help lang="it"/>
<help lang="it">https://opendatacommons.org/licenses/by/1-0/</help>
<view_text lang="it"/>
<text lang="es">Open Data Commons Attribution</text>
<help lang="es"/>
<help lang="es">https://opendatacommons.org/licenses/by/1-0/</help>
<view_text lang="es"/>
<additional_input>text</additional_input>
</option>
Expand All @@ -1898,19 +1898,19 @@
<uri_path>dataset_license_types/ODbl</uri_path>
<dc:comment>https://opendatacommons.org/licenses/odbl/1-0/</dc:comment>
<text lang="en">Open Data Commons Open Database</text>
<help lang="en"/>
<help lang="en">https://opendatacommons.org/licenses/odbl/1-0/</help>
<view_text lang="en"/>
<text lang="de">Open Data Commons Open Database</text>
<help lang="de"/>
<help lang="de">https://opendatacommons.org/licenses/odbl/1-0/</help>
<view_text lang="de"/>
<text lang="fr">Open Data Commons Open Database</text>
<help lang="fr"/>
<help lang="fr">https://opendatacommons.org/licenses/odbl/1-0/</help>
<view_text lang="fr"/>
<text lang="it">Open Data Commons Open Database</text>
<help lang="it"/>
<help lang="it">https://opendatacommons.org/licenses/odbl/1-0/</help>
<view_text lang="it"/>
<text lang="es">Open Data Commons Open Database</text>
<help lang="es"/>
<help lang="es">https://opendatacommons.org/licenses/odbl/1-0/</help>
<view_text lang="es"/>
<additional_input>text</additional_input>
</option>
Expand All @@ -1919,19 +1919,19 @@
<uri_path>dataset_license_types/cc0</uri_path>
<dc:comment/>
<text lang="en">Public domain (CC0)</text>
<help lang="en"/>
<help lang="en">https://creativecommons.org/publicdomain/zero/1.0/legalcode.en or https://opendatacommons.org/licenses/pddl/1-0/</help>
<view_text lang="en"/>
<text lang="de">Gemeinfrei (CC0)</text>
<help lang="de"/>
<help lang="de">https://creativecommons.org/publicdomain/zero/1.0/legalcode.de or https://opendatacommons.org/licenses/pddl/1-0/</help>
<view_text lang="de"/>
<text lang="fr">Domaine public (CC0)</text>
<help lang="fr"/>
<help lang="fr">https://creativecommons.org/publicdomain/zero/1.0/legalcode.fr or https://opendatacommons.org/licenses/pddl/1-0/</help>
<view_text lang="fr"/>
<text lang="it">Pubblico dominio (CC0)</text>
<help lang="it"/>
<help lang="it">https://creativecommons.org/publicdomain/zero/1.0/legalcode.it or https://opendatacommons.org/licenses/pddl/1-0/</help>
<view_text lang="it"/>
<text lang="es">Dominio público (CC0)</text>
<help lang="es"/>
<help lang="es">https://creativecommons.org/publicdomain/zero/1.0/legalcode.es or https://opendatacommons.org/licenses/pddl/1-0/</help>
<view_text lang="es"/>
<additional_input/>
</option>
Expand Down Expand Up @@ -2875,10 +2875,10 @@
<provider_key/>
<options>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/251" order="1"/>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/254" order="1"/>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/252" order="2"/>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/249" order="3"/>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/250" order="4"/>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/254" order="2"/>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/252" order="3"/>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/249" order="4"/>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dataset_size_options/250" order="5"/>
</options>
<conditions/>
</optionset>
Expand Down Expand Up @@ -5493,7 +5493,7 @@
<text lang="es">No, no se usarán datos existentes</text>
<help lang="es"/>
<view_text lang="es"/>
<additional_input>text</additional_input>
<additional_input/>
</option>
<option dc:uri="https://rdmorganiser.github.io/terms/options/dfg_reuse/dfg-re_04">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
Expand Down
Binary file removed shared/fodako/Dokumentation5.1.pdf
View file
Binary file not shown.
Binary file added shared/fodako/Dokumentation5.2.docx
View file
Binary file not shown.
Binary file added shared/fodako/Dokumentation5.2.pdf
View file
Binary file not shown.
66 changes: 66 additions & 0 deletions shared/fodako/attributes-FoDaKo-dfg.xml
View file
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>
Loading

0 comments on commit dd1f888

Please sign in to comment.