From 3deeaf5cd3e3d2279ca1fd07839f14dea586e288 Mon Sep 17 00:00:00 2001 From: Zack-83 Date: Mon, 6 May 2024 13:18:44 +0200 Subject: [PATCH] integrate README --- README.md | 56 +++++++++++++++++++++++++++++++++++++++--- rdmorganiser/README.md | 29 ---------------------- 2 files changed, 52 insertions(+), 33 deletions(-) delete mode 100644 rdmorganiser/README.md diff --git a/README.md b/README.md index 216875f1..2e6b2aff 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,61 @@ ![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). -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 main branch [master-rdmo2.x](https://github.com/rdmorganiser/rdmo-catalog/tree/master-rdmo2.x) contains material structured according to the recommended data model 2.0.0+. It is at the latest state and will be updated over time. -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. +The legacy branch [master-rdmo1.x](https://github.com/rdmorganiser/rdmo-catalog/tree/master-rdmo1.x) contains material structured according to the previous data model 1.6.0+. It is frozen at the state of April 2024 und will be not updated any more. -Different scripts are located in `tools`. These are interesting for people maintaining this repo. +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`](./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. 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 .xml +Management --> Conditions --> Import .xml +Management --> Option sets --> Import .xml +Management --> Conditions --> Import .xml # yes, again +Management --> Questions --> Import .xml +Management --> Tasks --> Import .xml +Management --> Views --> Import .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/.xml +./manage.py import /path/to/conditions/.xml +./manage.py import /path/to/options/.xml +./manage.py import /path/to/conditions/.xml # yes, again +./manage.py import /path/to/questions/.xml +./manage.py import /path/to/tasks>/.xml +./manage.py import /path/to/views>/.xml +``` + +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 diff --git a/rdmorganiser/README.md b/rdmorganiser/README.md deleted file mode 100644 index 43e26f40..00000000 --- a/rdmorganiser/README.md +++ /dev/null @@ -1,29 +0,0 @@ -RDMO catalog -============ - -This repository contains the content for [RDMO](https://github.com/rdmorganiser/rdmo) prepared by the [RDMO-Project](https://rdmorganiser.github.io). - -To install the catalog into a freshly installed instance of RDMO, use - -``` -./manage.py import /path/to/domain/rdmo.xml -./manage.py import /path/to/conditions/rdmo.xml # yes, again -./manage.py import /path/to/options/rdmo.xml -./manage.py import /path/to/conditions/rdmo.xml # yes, again -./manage.py import /path/to/questions/rdmo.xml -./manage.py import /path/to/tasks/rdmo.xml -./manage.py import /path/to/views/rdmo.xml -``` - -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 --------- - -To indent the XML files use: - -```bash -for f in *.xml; do xmllint --format $f > /tmp/$f; mv /tmp/$f $f; done -```