Merge pull request #91 from rdmorganiser/id_attribute

Fix id attributes for RDMO 1.6
rdmorganiser · Oct 8, 2021 · 8cc58d6 · 8cc58d6
2 parents 1d145e4 + b5257fc
commit 8cc58d6
Show file tree

Hide file tree

Showing 23 changed files with 310 additions and 309 deletions.
diff --git a/rdmorganiser/README.md b/rdmorganiser/README.md
@@ -17,6 +17,7 @@ To install the catalog into a freshly installed instance of RDMO, use
 
 Use the same order when importing over the RDMO web interface.
 
+Please note that the master branch will only work with the latest version of RDMO. If you need the xml files for an older version, please browse the releases or contact us.
 
 Reindent
 --------

diff --git a/rdmorganiser/domain/rdmo.xml b/rdmorganiser/domain/rdmo.xml
@@ -417,7 +417,7 @@
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>id</key>
 		<path>project/dataset/id</path>
-		<dc:comment/>
+		<dc:comment>Short ID for a dataset, used as questionset attribute for dataset related questionsets.</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/ipr">
@@ -1026,7 +1026,7 @@
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>id</key>
 		<path>project/funder/id</path>
-		<dc:comment/>
+		<dc:comment>Short ID for a funder, used as questionset attribute for funder related questionsets.</dc:comment>
 		<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/funder"/>
 	</attribute>
 	<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/funder/name">
@@ -1229,7 +1229,7 @@
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>id</key>
 		<path>project/partner/id</path>
-		<dc:comment/>
+		<dc:comment>Short ID for a project partner, used as questionset attribute for project partner related questionsets.</dc:comment>
 		<parent dc:uri="https://rdmorganiser.github.io/terms/domain/project/partner"/>
 	</attribute>
 	<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/partner/name">

diff --git a/rdmorganiser/questions/dcc.xml b/rdmorganiser/questions/dcc.xml
@@ -234,7 +234,7 @@
 		<key>dataset-dataset</key>
 		<path>dcc/collection/dataset-dataset</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/collection"/>
 		<is_collection>True</is_collection>
 		<order>11</order>
@@ -360,7 +360,7 @@
 		<key>dataset-format_size</key>
 		<path>dcc/collection/dataset-format_size</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/collection"/>
 		<is_collection>True</is_collection>
 		<order>12</order>
@@ -564,7 +564,7 @@
 		<key>process-versioning</key>
 		<path>dcc/collection/process-versioning</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/collection"/>
 		<is_collection>True</is_collection>
 		<order>22</order>
@@ -914,7 +914,7 @@
 		<key>ipr-ipr</key>
 		<path>dcc/ethics_legal/ipr-ipr</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/ethics_legal"/>
 		<is_collection>True</is_collection>
 		<order>20</order>
@@ -1055,7 +1055,7 @@
 		<key>storage_backup-storage</key>
 		<path>dcc/storage_backup/storage_backup-storage</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/storage_backup"/>
 		<is_collection>True</is_collection>
 		<order>11</order>
@@ -1356,7 +1356,7 @@
 		<key>preservation-archive</key>
 		<path>dcc/selection_preservation/preservation-archive</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/selection_preservation"/>
 		<is_collection>True</is_collection>
 		<order>20</order>
@@ -1491,7 +1491,7 @@
 		<key>sharing-sharing</key>
 		<path>dcc/sharing/sharing-sharing</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/sharing"/>
 		<is_collection>True</is_collection>
 		<order>10</order>
@@ -1616,7 +1616,7 @@
 		<key>sharing-pid</key>
 		<path>dcc/sharing/sharing-pid</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/sharing"/>
 		<is_collection>True</is_collection>
 		<order>12</order>
@@ -1718,7 +1718,7 @@
 		<key>restrictions-restrictions</key>
 		<path>dcc/sharing/restrictions-restrictions</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/dcc/sharing"/>
 		<is_collection>True</is_collection>
 		<order>20</order>

diff --git a/rdmorganiser/questions/fhpshort.xml b/rdmorganiser/questions/fhpshort.xml
@@ -186,7 +186,7 @@
 		<key>project-partners-partner</key>
 		<path>fhpshort/general/project-partners-partner</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/partner"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/partner/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/general"/>
 		<is_collection>True</is_collection>
 		<order>21</order>
@@ -347,7 +347,7 @@
 		<key>data-dataset</key>
 		<path>fhpshort/content-classification/data-dataset</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/content-classification"/>
 		<is_collection>True</is_collection>
 		<order>1</order>
@@ -408,7 +408,7 @@ Die Angaben zu den im Projekt erzeugten oder verwendeten Daten sind nach „Date
 		<key>data-existing_data</key>
 		<path>fhpshort/content-classification/data-existing_data</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/content-classification"/>
 		<is_collection>True</is_collection>
 		<order>2</order>
@@ -517,7 +517,7 @@ Die Angaben zu den im Projekt erzeugten oder verwendeten Daten sind nach „Date
 		<key>data-volume</key>
 		<path>fhpshort/technical-classification/data-volume</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/technical-classification"/>
 		<is_collection>True</is_collection>
 		<order>2</order>
@@ -564,7 +564,7 @@ Die Angaben zu den im Projekt erzeugten oder verwendeten Daten sind nach „Date
 		<key>data-formats</key>
 		<path>fhpshort/technical-classification/data-formats</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/technical-classification"/>
 		<is_collection>True</is_collection>
 		<order>3</order>
@@ -609,7 +609,7 @@ Die Angaben zu den im Projekt erzeugten oder verwendeten Daten sind nach „Date
 		<key>data-tools</key>
 		<path>fhpshort/technical-classification/data-tools</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/technical-classification"/>
 		<is_collection>True</is_collection>
 		<order>4</order>
@@ -683,7 +683,7 @@ Ebenso wie bei den Formaten gilt hier: je standardisierter, offener und etablier
 		<key>data-versioning</key>
 		<path>fhpshort/technical-classification/data-versioning</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/technical-classification"/>
 		<is_collection>True</is_collection>
 		<order>5</order>
@@ -740,7 +740,7 @@ Ebenso wie bei den Formaten gilt hier: je standardisierter, offener und etablier
 		<key>scenarios-usage</key>
 		<path>fhpshort/data-usage/scenarios-usage</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/data-usage"/>
 		<is_collection>True</is_collection>
 		<order>0</order>
@@ -815,7 +815,7 @@ Ebenso wie bei den Formaten gilt hier: je standardisierter, offener und etablier
 		<key>data-storage-and-security-storage</key>
 		<path>fhpshort/data-usage/data-storage-and-security-storage</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/data-usage"/>
 		<is_collection>True</is_collection>
 		<order>11</order>
@@ -860,7 +860,7 @@ Ebenso wie bei den Formaten gilt hier: je standardisierter, offener und etablier
 		<key>data-storage-and-security-data_security</key>
 		<path>fhpshort/data-usage/data-storage-and-security-data_security</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/data-usage"/>
 		<is_collection>True</is_collection>
 		<order>12</order>
@@ -957,7 +957,7 @@ Ebenso wie bei den Formaten gilt hier: je standardisierter, offener und etablier
 		<key>data-sharing-and-re-use-publication</key>
 		<path>fhpshort/data-usage/data-sharing-and-re-use-publication</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/data-usage"/>
 		<is_collection>True</is_collection>
 		<order>20</order>
@@ -1040,7 +1040,7 @@ Ebenso wie bei den Formaten gilt hier: je standardisierter, offener und etablier
 		<key>metadata-dataset</key>
 		<path>fhpshort/metadata-and-referencing/metadata-dataset</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/metadata-and-referencing"/>
 		<is_collection>True</is_collection>
 		<order>0</order>
@@ -1137,7 +1137,7 @@ Ebenso wie bei den Formaten gilt hier: je standardisierter, offener und etablier
 		<key>structure-granularity-and-referencing-structure</key>
 		<path>fhpshort/metadata-and-referencing/structure-granularity-and-referencing-structure</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/metadata-and-referencing"/>
 		<is_collection>True</is_collection>
 		<order>10</order>
@@ -1182,7 +1182,7 @@ Ebenso wie bei den Formaten gilt hier: je standardisierter, offener und etablier
 		<key>structure-granularity-and-referencing-pids</key>
 		<path>fhpshort/metadata-and-referencing/structure-granularity-and-referencing-pids</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/metadata-and-referencing"/>
 		<is_collection>True</is_collection>
 		<order>11</order>
@@ -1269,7 +1269,7 @@ Mehr Informationen zur Funktionsweise, Verwendung und verschiedenen Arten von PI
 		<key>sensitive-data-personal_data_yesno</key>
 		<path>fhpshort/legal-and-ethics/sensitive-data-personal_data_yesno</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/legal-and-ethics"/>
 		<is_collection>True</is_collection>
 		<order>1</order>
@@ -1338,7 +1338,7 @@ Der Umgang mit solchen Daten ist gesetzlich geregelt. Mehr Informationen (zwar a
 		<key>sensitive-data-other</key>
 		<path>fhpshort/legal-and-ethics/sensitive-data-other</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/legal-and-ethics"/>
 		<is_collection>True</is_collection>
 		<order>6</order>
@@ -1502,7 +1502,7 @@ Weitere relevante Schutzrechte können gewerbliche Schutzrechte wie Patente, Geb
 		<key>long-term-preservation-datasets</key>
 		<path>fhpshort/storage-and-long-term-preservation/long-term-preservation-datasets</path>
 		<dc:comment/>
-		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset"/>
+		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmo.fh-potsdam.de/terms/questions/fhpshort/storage-and-long-term-preservation"/>
 		<is_collection>True</is_collection>
 		<order>1</order>
-Original file line number
+Diff line change
@@ Expand Up @@
     Use the same order when importing over the RDMO web interface.
+    Please note that the master branch will only work with the latest version of RDMO. If you need the xml files for an older version, please browse the releases or contact us.
     Reindent
     --------
@@ Expand Down @@