Upgrade upstream 1.4.0 rdmo 1.6.0

CITATION.cff

@@ -0,0 +1,119 @@
+cff-version: 1.1.0
+
+message: If you refer to this content in a publication, please cite it as below.
+title: Content for Research Data Management Organizer (RDMO)
+doi: 10.5281/zenodo.596706
+license: CC0 1.0 Universal
+repository-code: https://github.com/rdmorganiser/rdmo-catalog
+
+authors:
+  - family-names: Michaelis
+    given-names:  Olaf
+    orcid:        https://orcid.org/0000-0002-5282-703X
+  - family-names: Klar
+    given-names:  Jochen
+    orcid:        https://orcid.org/0000-0002-5883-4273
+  - family-names: Grossmann
+    given-names:  Yves Vincent
+    orcid:        https://orcid.org/0000-0002-2880-8947
+  - family-names: Höhner
+    given-names:  Kathrin
+    orcid:        https://orcid.org/0000-0002-3988-7839
+  - family-names: Windeck
+    given-names:  Jürgen
+    orcid:        https://orcid.org/0000-0003-1909-4353
+  - family-names: Lanza
+    given-names:  Giacomo
+    orcid:        https://orcid.org/0000-0002-2239-3955
+  - family-names: Meier
+    given-names:  Laura
+    orcid:        https://orcid.org/0000-0003-1368-2306
+  - family-names: Schönau
+    given-names:  Sabine
+    orcid:        
+  - family-names: Richter
+    given-names:  Thomas
+    orcid:        https://orcid.org/0009-0005-7168-7959
+  - family-names: Riedel
+    given-names:  Roman
+    orcid:        
+  - family-names: Rodríguez
+    given-names:  Laura
+    orcid:        https://orcid.org/0000-0002-1446-2199
+  - family-names: Rühle
+    given-names:  Frank
+    orcid:        https://orcid.org/0000-0001-7688-2394
+  - family-names: Frenzel
+    given-names:  Johannes
+    orcid:        https://orcid.org/0000-0003-0458-5424
+  - family-names: Schröder
+    given-names:  Clara
+    orcid:        
+  - family-names: Terzijska
+    given-names:  Džulia
+    orcid:        https://orcid.org/0000-0002-1698-6826
+  - family-names: Wallace
+    given-names:  David
+    orcid:        https://orcid.org/0000-0001-8958-4601
+  - family-names: Spenger
+    given-names:  Martin
+    orcid:        https://orcid.org/0000-0002-8841-5985
+  - family-names: Wettermann
+    given-names:  Sarah
+    orcid:        https://orcid.org/0009-0006-5838-095X
+  - family-names: Rothe
+    given-names:  Robin
+    orcid:        https://orcid.org/0000-0003-3688-6942
+  - family-names: Sinn
+    given-names:  Christoph
+    orcid:        https://orcid.org/0000-0003-0275-1070
+  - family-names: Rathmann
+    given-names:  Torsten
+    orcid:        https://orcid.org/0000-0001-5880-1546
+  - family-names: Sutter
+    given-names:  Paul
+    orcid:        https://orcid.org/0000-0002-9883-0680
+  - family-names: Hasler
+    given-names:  Tim
+    orcid:        https://orcid.org/0000-0001-9164-3500
+
+  - family-names: Cardenas
+    given-names:  Yonny
+    orcid:        
+  - family-names: Grasso Toro
+    given-names:  Federico
+    orcid:        https://orcid.org/0000-0002-9041-0868
+  - family-names: Lanza
+    given-names:  Margherita
+    orcid:        
+  - family-names: Linares
+    given-names:  Jimena
+    orcid:        https://orcid.org/0000-0003-3847-2663
+  - family-names: Marmin
+    given-names:  Sébastien
+    orcid:        
+  - family-names: Martínez Muñoz
+    given-names:  David
+    orcid:        
+  - family-names: Piette
+    given-names:  Anne-Sophie
+    orcid:        https://orcid.org/0000-0002-7876-1251
+  - family-names: Pilori
+    given-names:  Dario
+    orcid:        https://orcid.org/0000-0003-4499-8573
+
+  - family-names: Engelhardt
+    given-names:  Claudia
+    orcid:        https://orcid.org/0000-0002-3391-7638
+  - family-names: Freund
+    given-names:  Jens
+    orcid:        https://orcid.org/0000-0001-6232-7568
+  - family-names: Hendricks
+    given-names:  Sonja
+    orcid:        
+  - family-names: Lemaire
+    given-names:  Marina
+    orcid:        https://orcid.org/0000-0003-4726-2481
+  - family-names: Straka
+    given-names:  Janine
+    orcid:        https://orcid.org/0000-0002-0695-1689

README.md

@@ -44,37 +44,51 @@ For problems or bugs with the RDMO Software, please use the issues in the [rdmo]
 
 ## Content curated by the RDMO team
 
-| Coverage (funder, subject, geographical region) | File / Creators                                                                                                                        | Last update |
-| ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
-| All questions (long)                            | [RDMO team](rdmorganiser/questions/rdmo.xml)                                                                                           | 2016        |
-| All questions (short)                           | [RDMO team](rdmorganiser/questions/fhpshort.xml)                                                                                       | 2018        |
-| DFG checklist                                   | [RDMO team](rdmorganiser/questions/DFG-Checkliste.xml)                                                                                 | 11/2022     |
-| Horizon Europe                                  | **catalog:** [RDMO team](rdmorganiser/questions/horizon-europe.xml)<br /> **view:** [RDMO team](rdmorganiser/views/horizon-europe.xml) | 12/2022     |
-| Swiss National Fund                             | [RDMO team](rdmorganiser/questions/snf.xml)                                                                                            | 2018        |
-| DCC checklist                                   | [RDMO team](rdmorganiser/questions/dcc.xml)                                                                                            | 10/2018     |
-| Software Management Plan                        | [RDMO team](rdmorganiser/questions/SMP-Questions.xml)                                                                                  | 08/2023     |
+|Subject/Coverage        |Catalog                                             |View |Last update |Creators  |
+|------------------------|----------------------------------------------------|-----|------------|----------|
+|All questions (long)    |[catalog](rdmorganiser/questions/rdmo.xml)          |     |2020-08|RDMO team      |
+|All questions (short)   |[catalog](rdmorganiser/questions/fhpshort.xml)      |     |2020-08|FHP / RDMO team|
+|DCC checklist           |[catalog](rdmorganiser/questions/dcc.xml)           |     |2018-10|RDMO team      |
+|DFG checklist           |[catalog](rdmorganiser/questions/DFG-Checkliste.xml)|[view](rdmorganiser/views/dfg-checkliste.xml)       |2023-11|RDMO team       |
+|Horizon Europe          |[catalog](rdmorganiser/questions/horizon-europe.xml)|[view](rdmorganiser/views/horizon-europe.xml)       |2022-12|RDMO team       |
+|Software Management Plan|[catalog](rdmorganiser/questions/SMP-Questions.xml) |[view (FAIR4RS)](rdmorganiser/views/FAIR4RSview.xml)|2023-08|MPDL / RDMO team|
+|Swiss National Fund     |[catalog](rdmorganiser/questions/snf.xml)           |[view](rdmorganiser/views/snf.xml)                  |2020-08|RDMO team       |
+|Bielefeld               |            |[view](rdmorganiser/views/bielefeld.xml)     |2019-01|RDMO team      |
+|CITEC                   |            |[view](rdmorganiser/views/citec.xml)         |2019-01|RDMO team      |
+|Costs                   |            |[view](rdmorganiser/views/costs.xml)         |2022-08|RDMO team      |
+|DMPonline               |            |[view](rdmorganiser/views/dmponline.xml)     |2019-01|RDMO team      |
+|DMPtool                 |            |[view](rdmorganiser/views/dmptool.xml)       |2019-01|RDMO team      |
+|Horizon 2020            |            |[view](rdmorganiser/views/horizon2020.xml)   |2019-01|RDMO team      |
+|All variables (to check)|            |[view](rdmorganiser/views/variable_check.xml)|2022-12|RDMO team      |
 
 ## Other content provided by the user community
 
-| Coverage (funder, subject, geographical region) | File / Creators                                                                                                                                                                                         | Last update |
-| ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
-| All questions (long)                            | [FoDaKo](shared/fodako/all_5.xml)                                                                                                                                                                       | 2016        |
-| BLE                                             | [Julius-Kühn-Institut](shared/BLE_JKI/)                                                                                                                                                                 | 06/2023     |
-| DFG checklist                                   | [FoDaKo](shared/fodako/dfg_5.xml)                                                                                                                                                                       | 11/2022     |
-| DFG Biodiversity research                       | [FoDaKo](shared/fodako/biodiversity_dfg_5.xml)                                                                                                                                                          | 11/2022     |
-| DFG Chemistry                                   | [FoDaKo](shared/fodako/chem_dfg_5.xml)<br /> [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/dfg-chemie/dfg_Chemie.xml )                                                                      | 12/2022     |
-| DFG 101 Ancient Cultures                        | [FoDaKo](shared/fodako/101_dfg_5.xml)<br /> [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/dfg-alte-kulturen/dfg_alte_kulturen_fk101.xml)                                                    | 11/2022     |
-| DFG 104 Spoken corpus                           | [FoDaKo](shared/fodako/spokencorpus_dfg_5.xml)                                                                                                                                                          | 11/2022     |
-| DFG 104 Text corpus                             | [FoDaKo](shared/fodako/textcorpus_dfg_5.xml)                                                                                                                                                            | 11/2022     |
-| DFG 105 Editions                                | [FoDaKo](shared/fodako/edition_dfg_5.xml)<br /> [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/dfg-editionen/dfg_editions.xml)                                                               | 11/2022     |
-| DFG 106 Social & Cultural Anthropology [...]    | [FoDaKo](shared/fodako/106_dfg_5.xml)<br /> [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/dfg-sozkulttheo/dfg_sozkulttheo_fk106.xml)                                                        | 11/2022     |
-| DFG 109 Educational Research                    | [FoDaKo](shared/fodako/109_dfg_5.xml)                                                                                                                                                                   | 11/2022     |
-| DFG 112 Economics                               | [FoDaKo](shared/fodako/112_dfg_5.xml)                                                                                                                                                                   | 11/2022     |
-| Emissions in animal husbandry                   | [EmiMin](shared/EmiMin/publisso_terms4life_emiminV1_questions.xml)<br /> [EmiMin (lead)](shared/EmiMin/publisso_terms4life_emimin_lead_V1_questions.xml)                                                |             |
-| Hessen State                                    | [HeFDI](shared/HeFDI/4_hefdi_template_questions_1.4.xml)                                                                                                                                                |             |
-| Horizon 2020                                    | **catalog:** [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/h2020-ehum/ehum_h2020_fragebogen.xml)<br /> **view:** [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/h2020-ehum/views_h2020.xml) |  |
-| Mathematics                                     | [DFG Excellence Cluster MATH+](shared/MATH+/mathplus_questions.xml)                                                                                                                                     | 11/2022     |
-| Mechanical Engineering                          | [NFDI4Ing](shared/nfdi4ing/rdmo_mechanical_engineering/catalog_mb_20190124.xml)                                                                                                                         |             |
-| VW Foundation - Science Europe                  | [FDM Bayern eHumanities](shared/ub_fau_erlangen_nuernberg/ScienceEurope_VW_Stiftung/catalog_VW_SE.xml)                                                                                                  |             |
-
-29 catalogs shared
+|Subject/Coverage         |Catalog                                        |View|Last update |Creators  |
+|-------------------------|-----------------------------------------------|----|------------|----------|
+|All questions (RDMO+DFG) |[catalog](shared/fodako/all_5.xml)             |    |2022-03|FoDaKo         |
+|BLE                      |[catalog](shared/BLE_JKI/)  |[view](shared/BLE_JKI/)|2023-10|Julius-Kühn-Institut|
+|DFG checklist            |[catalog](shared/fodako/dfg_5.xml)             |    |2022-03|FoDaKo         |
+|DFG Biodiversity research|[catalog](shared/fodako/biodiversity_dfg_5.xml)|    |2022-03|FoDaKo         |
+|DFG Chemistry            |[catalog](shared/fodako/chem_dfg_5.xml)        |    |2022-03|FoDaKo         |
+|DFG Chemistry            |[catalog](shared/ub_fau_erlangen_nuernberg/dfg-chemie/dfg_Chemie.xml)||2023-08|FDM Bayern eHumanities|
+|DFG Physics              |[catalog](shared/ub_fau_erlangen_nuernberg/dfg-physik/dfg_Physik.xml)||2023-08|FDM Bayern eHumanities|
+|DFG 101 Ancient Cultures |[catalog](shared/ub_fau_erlangen_nuernberg/dfg-alte-kulturen/dfg_alte_kulturen_fk101.xml)||2020-09|FDM Bayern eHumanities|
+|DFG 101 Ancient Cultures |[catalog](shared/fodako/101_dfg_5.xml)         |    |2022-03|FoDaKo|
+|DFG 104 Spoken corpus    |[catalog](shared/fodako/spokencorpus_dfg_5.xml)|    |2022-03|FoDaKo|
+|DFG 104 Text corpus      |[catalog](shared/fodako/textcorpus_dfg_5.xml)  |    |2022-03|FoDaKo|
+|DFG 105 Editions         |[catalog](shared/fodako/edition_dfg_5.xml)     |    |2022-03|FoDaKo|
+|DFG 105 Editions         |[catalog](shared/ub_fau_erlangen_nuernberg/dfg-editionen/dfg_editions.xml)||2020-09|FDM Bayern eHumanities|
+|DFG 106 Social & Cultural Anthropology|[catalog](shared/ub_fau_erlangen_nuernberg/dfg-sozkulttheo/dfg_sozkulttheo_fk106.xml)||2020-09|FDM Bayern eHumanities|
+|DFG 106 Social & Cultural Anthropology|[catalog](shared/fodako/106_dfg_5.xml)||2022-03|FoDaKo|
+|DFG 109 Educational Research          |[catalog](shared/fodako/109_dfg_5.xml)||2022-03|FoDaKo|
+|DFG 112 Economics |[catalog](shared/fodako/112_dfg_5.xml)                    ||2022-03|FoDaKo|
+|ERC grants        |[catalog](shared/ub_fau_erlangen_nuernberg/erc-grants/erc.xml)||2023-08|FDM Bayern eHumanities|
+|Emissions in animal husbandry|[catalog 1](shared/EmiMin/publisso_terms4life_emiminV1_questions.xml)<br />[catalog 2](shared/EmiMin/publisso_terms4life_emimin_lead_V1_questions.xml)||2021-04|EmiMin|
+|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/)                     ||2023-11|FDNext|
+|VW Foundation - Science Europe|[catalog](shared/ub_fau_erlangen_nuernberg/ScienceEurope_VW_Stiftung/catalog_VW_SE.xml)||2021-04|FDM Bayern eHumanities|
+
+Total: 33 catalogs, 13 views

rdmorganiser/_changes/new_questions.xml

@@ -43,13 +43,13 @@
 		<optionsets/>
 		<conditions/>
 	</question>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/ua_ruhr/general/other-requirements-yesno/abstract">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/ua_ruhr/general/other-requirements/abstract">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>abstract</key>
-		<path>ua_ruhr/general/other-requirements-yesno/abstract</path>
+		<path>ua_ruhr/general/other-requirements/abstract</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/conditions"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/ua_ruhr/general/other-requirements-yesno"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/ua_ruhr/general/other-requirements"/>
 		<is_collection>False</is_collection>
 		<is_optional>False</is_optional>
 		<order>0</order>

rdmorganiser/conditions/rdmo.xml

@@ -18,6 +18,15 @@
 		<target_text>1</target_text>
 		<target_option/>
 	</condition>
+	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/data_published">
+		<uri_prefix>https://rdmorganiser.github.io/terms/</uri_prefix>
+		<key>data_published</key>
+		<dc:comment/>
+		<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/data_publication_date"/>
+		<relation>eq</relation>
+		<target_text/>
+		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/dfg_using_when/dfg-uw_08"/>
+	</condition>
 	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/data_sharing">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>data_sharing</key>
@@ -117,6 +126,15 @@
 		<target_text/>
 		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/preservation_repository_options/138"/>
 	</condition>
+	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/reuse_scenario">
+		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
+		<key>reuse_scenario</key>
+		<dc:comment/>
+		<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/reuse_scenario"/>
+		<relation>neq</relation>
+		<target_text/>
+		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/dfg_reuse_context/dfg-rsc_04"/>
+	</condition>
 	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/rights_owner_clear">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>rights_owner_clear</key>