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-2.x #267

Closed
wants to merge 17 commits into from
Closed

Nicht mergen: Vergleich 1.x-2.x #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
94676d3
FDNext: Fixed missing question texts (#258)
johlton Mar 15, 2024
33a71c7
FDNext: Updated README (#261)
johlton Mar 20, 2024
8f6b20b
Merge branch 'master' into master-rdmo2.x
Zack-83 Apr 25, 2024
6015cbf
Update rdmo.xml
Zack-83 Apr 25, 2024
aab21f1
.,
Zack-83 Apr 25, 2024
a1ac610
update domain, views, tasks, conditions
Zack-83 Apr 25, 2024
932c21d
Merge branch 'master' into master-rdmo2.x
Zack-83 Apr 25, 2024
59a3dcc
update
Zack-83 Apr 25, 2024
c35f527
two views
Zack-83 Apr 26, 2024
3da8b69
Merge branch 'master' into master-rdmo2.x
Zack-83 Apr 29, 2024
dd03486
Merge remote-tracking branch 'origin/master-rdmo1.x' into master-rdmo2.x
Zack-83 Apr 29, 2024
2ea57ee
remove empty lines
Zack-83 Apr 29, 2024
00be71f
Merge branch 'master-rdmo1.x' into master-rdmo2.x
Zack-83 Apr 29, 2024
7b31b70
Merge branch 'master-rdmo1.x' into master-rdmo2.x
Zack-83 Apr 29, 2024
bf710cd
FDNext: Missing attributes and README (#268)
johlton Apr 29, 2024
58ca69f
harmonise
Zack-83 Apr 29, 2024
d0be5b5
Merge branch 'master-rdmo1.x' into master-rdmo2.x
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
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
Loading
Loading