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.

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

Prepare first 2.x-compatible release #260

Closed
wants to merge 75 commits into from
Closed
Show file tree
Hide file tree
Changes from 75 commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
136869a
sort items and adjust numbering
Zack-83 Mar 15, 2024
f7f775b
Merge branch 'master' into master-rdmo1.x-sorted
Zack-83 Apr 25, 2024
7d38e84
Merge branch 'master' into master-rdmo1.x-sorted
Zack-83 Apr 25, 2024
7e57718
Update rdmorganiser/conditions/rdmo.xml
Zack-83 Apr 25, 2024
aaccdeb
update
Zack-83 Apr 25, 2024
0a6611c
Merge branch 'master-rdmo1.x-sorted' of https://github.com/rdmorganis…
Zack-83 Apr 25, 2024
99a5975
Merge branch 'master' into master-rdmo1.x-sorted
Zack-83 Apr 25, 2024
78a402b
Merge branch 'master' into master-rdmo1.x-sorted
Zack-83 Apr 25, 2024
b5851ff
Update rdmorganiser/questions/snf.xml
Zack-83 Apr 25, 2024
90dfe14
Update snf.xml
Zack-83 Apr 25, 2024
4e934c8
Merge branch 'master-rdmo1.x-sorted' of https://github.com/rdmorganis…
Zack-83 Apr 25, 2024
b33de8a
Merge branch 'master' into master-rdmo1.x-sorted
Zack-83 Apr 25, 2024
6429161
Update snf.xml
Zack-83 Apr 25, 2024
f08768b
Delete rdmorganiser/questions/smp.xml
Zack-83 Apr 25, 2024
0c0b7f7
Merge branch 'master-rdmo1.x-sorted' of https://github.com/rdmorganis…
Zack-83 Apr 25, 2024
2c35353
Merge branch 'master' into master-rdmo1.x-sorted
Zack-83 Apr 25, 2024
ae3456b
coherence check
Zack-83 Apr 29, 2024
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
cc47d61
Merge branch 'master' into master-rdmo2.x-sorted
Zack-83 Apr 29, 2024
ddf28db
Merge remote-tracking branch 'origin/master-rdmo1.x' into master-rdmo…
Zack-83 Apr 29, 2024
78fa44f
sort items and adjust numbering
Zack-83 Mar 15, 2024
d585bc7
update
Zack-83 Apr 25, 2024
afed36d
Delete rdmorganiser/questions/smp.xml
Zack-83 Apr 25, 2024
d5d99ee
coherence check
Zack-83 Apr 29, 2024
0e13afb
update
Zack-83 Apr 25, 2024
07b756d
convert to new format and adjust sorting
Zack-83 Mar 15, 2024
dc9fdc3
remove doublettes with old names
Zack-83 Mar 15, 2024
2269cc2
Update view-horizon2020.xml
Zack-83 Apr 25, 2024
81e509e
adjusted
Zack-83 Apr 25, 2024
ea1cde6
Apply suggestions from code review
Zack-83 Apr 25, 2024
c1155da
Apply suggestions from code review
Zack-83 Apr 25, 2024
9653d5f
Update rdmorganiser/views/view-citec.xml
Zack-83 Apr 25, 2024
0353f75
Update rdmorganiser/views/view-bielefeld.xml
Zack-83 Apr 25, 2024
f9156c6
Update rdmorganiser/views/view-FAIR4RS.xml
Zack-83 Apr 25, 2024
464e04e
Apply suggestions from code review
Zack-83 Apr 25, 2024
820dfdd
update two views
Zack-83 Apr 25, 2024
7657734
Apply suggestions from code review
Zack-83 Apr 25, 2024
bc695a6
two views
Zack-83 Apr 26, 2024
bdaf8d6
rename
Zack-83 Apr 26, 2024
85b099e
remove
Zack-83 Apr 26, 2024
36a1e9a
add
Zack-83 Apr 26, 2024
0deaad1
rename
Zack-83 Apr 26, 2024
f3f8589
Merge branch 'master-rdmo2.x-sorted' of https://github.com/rdmorganis…
Zack-83 Apr 29, 2024
1818149
harmonise
Zack-83 Apr 29, 2024
ac1a2cf
harmonise
Zack-83 Apr 29, 2024
a4f149b
Merge branch 'master-rdmo1.x' into master-rdmo2.x-sorted
Zack-83 Apr 29, 2024
9c9e7e1
Improve README.md
Zack-83 Apr 25, 2024
5615800
Update rdmorganiser/README.md
Zack-83 Apr 25, 2024
ff63b97
Update README.md
Zack-83 Apr 29, 2024
812dd15
Update rdmorganiser/README.md
Zack-83 Apr 29, 2024
16740f6
integrate inner README into outer README
Zack-83 Apr 29, 2024
dc14a3a
Update README.md
Zack-83 Apr 29, 2024
7b7de79
Update README.md
Zack-83 Apr 29, 2024
0e5187c
Update README.md
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
52 changes: 48 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,57 @@

![Tests](https://github.com/rdmorganiser/rdmo-catalog/actions/workflows/tests.yaml/badge.svg)

The repository holds XML files that can be imported into RDMO. They contain different kinds of information like for example the domain model, question catalogs or optionsets.
This repository contains all content objects (catalogs, attributes, options, conditions, views, tasks) to be used with the DMP software [RDMO](https://github.com/rdmorganiser/rdmo)
Zack-83 marked this conversation as resolved.
Show resolved Hide resolved

The files that are officially provided by the RDMO project are in the `rdmorganiser` folder. We recommend to import these files to be able to make use of the official domain model, options, tasks and conditions. *Note that parts of these data are required to import user content because RDMO user's question catalogs may refer to parts of the official data*.
The content officially curated by the [RDMO Consortium](https://rdmorganiser.github.io/Community/) is in the [`rdmorganiser`](./rdmorganiser) folder. We recommend to import these files to be able to make use of the official domain model, options, tasks and conditions. *Note that parts of these data are required to import user content because RDMO user's question catalogs may refer to parts of the official data*.

Content shared by RDMO Users can be found under `shared`. There may be multiple files in a folder like for example conditions, options and questions. Files in the same folder belong together. All of them should be imported. Please pay attention to the order in which you import files. Question catalogs referring to other content should be imported at last.
Content shared by RDMO Users can be found under [`shared`](./shared). There may be multiple files in a folder like for example conditions, options and questions. Files in the same folder belong together: all of them should be imported.

Different scripts are located in `tools`. These are interesting for people maintaining this repo.
Please pay attention to the order in which you import files. Question catalogs referring to other content should be imported at last. See the following section for details.

Different scripts are located in [`tools`](./tools). These are interesting for people maintaining this repo.

# How to install content

The RDMO content objects (catalogs, attributes, options, conditions, views, tasks) depend on each other, as shown in the [documentation](https://rdmo.readthedocs.io/en/latest/management/data-model.html).

In particular, the installation of question catalogues requires the newest version of attributes, optionsets and conditions.

Therefore we suggest this sequence to install content in a RDMO instance:

## Via the RDMO web interface

Management --> Attributes --> Import <domain_file>.xml
Management --> Conditions --> Import <conditions_file>.xml
Management --> Option sets --> Import <options_file>.xml
Management --> Conditions --> Import <conditions_file>.xml # yes, again
Management --> Questions --> Import <catalog_file>.xml
Management --> Tasks --> Import <tasks_file>.xml
Management --> Views --> Import <views_file>.xml

REMARK: If the chosen catalog is available as a **full XML**, it already includes the necessary attributes, conditions and options.

## Via a Python script

```python
./manage.py import /<path/to/domain>/rdmo.xml
./manage.py import /<path/to/conditions>/rdmo.xml
./manage.py import /<path/to/options>/rdmo.xml
./manage.py import /<path/to/conditions>/rdmo.xml # yes, again
./manage.py import /<path/to/questions>/<chosen_catalog>.xml
./manage.py import /<path/to/tasks>/<chosen_task>.xml
./manage.py import /<path/to/views>/<chosen_view>.xml
```
Zack-83 marked this conversation as resolved.
Show resolved Hide resolved

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.

To indent the XML files use:

```bash
for f in *.xml; do xmllint --format $f > /tmp/$f; mv /tmp/$f $f; done
```

## Issues

Expand Down
29 changes: 0 additions & 29 deletions rdmorganiser/README.md

This file was deleted.

File renamed without changes.
Loading
Loading