Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nicht mergen: Vergleich 1.x und 2.x zur Kontrolle #266

Closed
wants to merge 24 commits into from
Closed

Nicht mergen: Vergleich 1.x und 2.x zur Kontrolle #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
af0c0aa
FDNext: Updated README (#261)
johlton Mar 20, 2024
9d72ef3
.,
Zack-83 Apr 25, 2024
c934d8d
update domain, views, tasks, conditions
Zack-83 Apr 25, 2024
c0680e4
update
Zack-83 Apr 25, 2024
dc834d1
two views
Zack-83 Apr 26, 2024
8507e0a
convert to new format and adjust sorting
Zack-83 Mar 15, 2024
a93c243
remove doublettes with old names
Zack-83 Mar 15, 2024
90ae68e
Update view-horizon2020.xml
Zack-83 Apr 25, 2024
143f02f
adjusted
Zack-83 Apr 25, 2024
64cd67e
Apply suggestions from code review
Zack-83 Apr 25, 2024
4f102e1
Apply suggestions from code review
Zack-83 Apr 25, 2024
08bf4e6
Update rdmorganiser/views/view-citec.xml
Zack-83 Apr 25, 2024
081037c
Update rdmorganiser/views/view-bielefeld.xml
Zack-83 Apr 25, 2024
4738108
Update rdmorganiser/views/view-FAIR4RS.xml
Zack-83 Apr 25, 2024
4eb6c69
Apply suggestions from code review
Zack-83 Apr 25, 2024
a8932ff
update two views
Zack-83 Apr 25, 2024
5d15d02
Apply suggestions from code review
Zack-83 Apr 25, 2024
de773f8
two views
Zack-83 Apr 26, 2024
4ea9972
rename
Zack-83 Apr 26, 2024
685d843
remove
Zack-83 Apr 26, 2024
aa830b4
add
Zack-83 Apr 26, 2024
29a5a11
rename
Zack-83 Apr 26, 2024
1d087c8
update
Zack-83 Apr 29, 2024
cc47d61
Merge branch 'master' into master-rdmo2.x-sorted
Zack-83 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions rdmorganiser/conditions/rdmo.xml → rdmorganiser/conditions/conditions.xml
View file
Open in desktop
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/">
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2024-03-11T10:51:39.946148+01:00" version="2.0.0">
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/additional_rdm_policy">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>additional_rdm_policy</key>
<uri_path>additional_rdm_policy</uri_path>
<dc:comment>There are additional data management requirements.</dc:comment>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/yesno"/>
<relation>eq</relation>
Expand All @@ -11,7 +11,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/application-class-1">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>application-class-1</key>
<uri_path>application-class-1</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/smp/application-class"/>
<relation>eq</relation>
Expand All @@ -20,7 +20,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/application-class-2">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>application-class-2</key>
<uri_path>application-class-2</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/smp/application-class"/>
<relation>eq</relation>
Expand All @@ -29,7 +29,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/application-class-3">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>application-class-3</key>
<uri_path>application-class-3</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/smp/application-class"/>
<relation>eq</relation>
Expand All @@ -38,7 +38,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/costs_relevant">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>costs_relevant</key>
<uri_path>costs_relevant</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/costs"/>
<relation>eq</relation>
Expand All @@ -47,7 +47,7 @@
</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>
<uri_path>data_published</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/data_publication_date"/>
<relation>eq</relation>
Expand All @@ -56,7 +56,7 @@
</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>
<uri_path>data_sharing</uri_path>
<dc:comment>The data will be shared.</dc:comment>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sharing/yesno"/>
<relation>eq</relation>
Expand All @@ -65,7 +65,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/embargo">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>embargo</key>
<uri_path>embargo</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/preservation/embargo_period"/>
<relation>gt</relation>
Expand All @@ -74,7 +74,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/infrastructure_resources">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>infrastructure_resources</key>
<uri_path>infrastructure_resources</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/usage_infrastructure"/>
<relation>eq</relation>
Expand All @@ -83,7 +83,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/intellectual_property_rights">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>intellectual_property_rights</key>
<uri_path>intellectual_property_rights</uri_path>
<dc:comment>The project uses data or software that is protected by intellectual property rights.</dc:comment>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/legal_aspects/ipr/yesno"/>
<relation>eq</relation>
Expand All @@ -92,7 +92,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/international">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>international</key>
<uri_path>international</uri_path>
<dc:comment>The legal situation of different countries has to be considered.</dc:comment>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/legal_aspects/international_yesno"/>
<relation>eq</relation>
Expand All @@ -101,7 +101,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/law_international">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>law_international</key>
<uri_path>law_international</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/legal_aspects/international_yesno"/>
<relation>eq</relation>
Expand All @@ -110,7 +110,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/long_term_preservation">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>long_term_preservation</key>
<uri_path>long_term_preservation</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/preservation"/>
<relation>eq</relation>
Expand All @@ -119,7 +119,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/other_sensitive_data">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>other_sensitive_data</key>
<uri_path>other_sensitive_data</uri_path>
<dc:comment>Other sensitive data being used in the project.</dc:comment>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/other/yesno"/>
<relation>eq</relation>
Expand All @@ -128,7 +128,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/personal_data">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>personal_data</key>
<uri_path>personal_data</uri_path>
<dc:comment>Personal data is used in the project.</dc:comment>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data_yesno/yesno"/>
<relation>eq</relation>
Expand All @@ -137,7 +137,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/personal_inf_bdsg_3_9">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>personal_inf_bdsg_3_9</key>
<uri_path>personal_inf_bdsg_3_9</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sensitive_data/personal_data/bdsg_3_9"/>
<relation>eq</relation>
Expand All @@ -146,7 +146,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/publish-software">
<uri_prefix>https://rdmorganiser.github.io/terms/</uri_prefix>
<key>publish-software</key>
<uri_path>publish-software</uri_path>
<dc:comment>introduced by the Max Planck Digital Library to implement the Software Management Plan</dc:comment>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/smp/software-sharing"/>
<relation>neq</relation>
Expand All @@ -155,7 +155,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/repository_extern">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>repository_extern</key>
<uri_path>repository_extern</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/preservation/repository"/>
<relation>neq</relation>
Expand All @@ -164,7 +164,7 @@
</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>
<uri_path>reuse_scenario</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/reuse_scenario"/>
<relation>neq</relation>
Expand All @@ -173,7 +173,7 @@
</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>
<uri_path>rights_owner_clear</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/ipr/owner/name"/>
<relation>eq</relation>
Expand All @@ -182,7 +182,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/rights_owner_unclear">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>rights_owner_unclear</key>
<uri_path>rights_owner_unclear</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/ipr/owner/name"/>
<relation>eq</relation>
Expand All @@ -191,7 +191,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/usage_support">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>usage_support</key>
<uri_path>usage_support</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/usage_support"/>
<relation>eq</relation>
Expand All @@ -200,7 +200,7 @@
</condition>
<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/versioning_tool_undecided">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>versioning_tool_undecided</key>
<uri_path>versioning_tool_undecided</uri_path>
<dc:comment/>
<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/versioning_tool"/>
<relation>eq</relation>
Expand Down
2 changes: 1 addition & 1 deletion rdmorganiser/domain/rdmo.xml → rdmorganiser/domain/attributes.xml
View file
Open in desktop
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="2022-12-19T16:31:16.180308+01:00">
<rdmo xmlns:dc="http://purl.org/dc/elements/1.1/" created="2024-03-11T10:50:02.573612+01:00" version="2.0.0">
<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project">
<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
<key>project</key>
Expand Down
Loading