Skip to content

Add support for the ICAT schema 5.0 extensions #106

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

Jump to bottom
Merged
RKrahl merged 36 commits into from
Nov 23, 2022
Merged

Add support for the ICAT schema 5.0 extensions #106

RKrahl merged 36 commits into from
Nov 23, 2022

Conversation

@RKrahl
Copy link
Member

@RKrahl RKrahl commented Nov 23, 2022

Various changes that are needed to take the schema extension included in icat.server 5.0 into account:

  • review of icatdump and icatingest:
    • icatdump takes the new entity classes into account,
    • change the order and arrangement of data objects in the dumpfile,
    • add a version 5.0 of the dumpfile schema,
  • prescribe a custom sorting order for a few of the new entity classes,
  • icat.ids.DataSelection takes dataCollectionInvestigations into account when adding a DataCollection,
  • add example data and tests for the new entity classes,
  • minor review of example data.

Note: the changes in the arrangement of data in the dumpfile are partly incompatible: in some cases, older versions of icatingest will fail to read dump files written by new versions of icatdump.

RKrahl added 30 commits July 24, 2020 13:56
@RKrahl
Add example data for techniques.
841f0c8
@RKrahl
Merge branch 'develop' into icat-schema
8e22b9e
@RKrahl
Add Technique, DatasetInstrument, and DatasetTechnique to dump_queries
b5b3cba
@RKrahl
Code formatting
bec9c85
@RKrahl
Add new entity types
f66b4b6
@RKrahl
Retain certain objects in the index to enable them to be referenced
2d960fd 
across chunk boundaries in ICAT data files
@RKrahl
Move DataCollections in a separate chunk in ICAT data files
9ae2804
@RKrahl
Add FundingReference and InvestigationFunding to dump_queries
734ad53
@RKrahl
Add DataPublication and related classes to dump_queries
d684e98
@RKrahl
Tweak sorting for DataPublicationDate and DataPublicationUser
b4eb480
@RKrahl
Merge branch 'develop' into icat-schema
673db38
@RKrahl
Use PaNET terms for techniques in example data
3a2905e
@RKrahl
Add example ICAT data files and reference summary output for ICAT 5.0
d1f3f9e 
to be used in the test suite
@RKrahl
Review the dump queries
1e2727f
@RKrahl
Merge branch 'develop' into icat-schema
f753571
@RKrahl
Add permissions needed for the ICAT 5.0 schema extensions
e70fc5e
@RKrahl
Fixup b5b3cba: forgot to include technique
99d06a8
@RKrahl
- Add creation of Techniques in init-icat.py
e1fbb22 
- Add creation of DatasetInstruments and DatasetTechniques in
  add-investigation-data.py
@RKrahl
Add InvestigationFacilityCycles in create-investigation.py
405d552
@RKrahl
Take dataCollectionInvestigations (to be added in icat.server 5.0)
cee985b 
into account when extending a DataSelection by a DataCollection
@RKrahl
Merge branch 'develop' into icat-schema
c3bc655
@RKrahl
Fix icatdata-5.0.xsd: add missing one to many relationships
0b3327f 
datasetInstruments and datasetTechniques in dataset
@RKrahl
Update to last minute schema changes in icatproject/icat.server#297
e5c3111
@RKrahl
Merge branch 'develop' into icat-schema
5ea182b
@RKrahl
Minor review of example data:
91fdb2a 
- adopt a somewhat more consistent schema prefix notation for PIDs
- some reformatting of the YAML file
@RKrahl
Example data:
f34c672 
- add another DatafileFormat HDF5
- change the type for DatafileFormat NeXus
@RKrahl
Example data: add rules for the ingester
5ec06e3
@RKrahl
Example data: add a DataPublication
d34bbc2
@RKrahl
icat.server 5.0 has been released a while ago
1b10069
@RKrahl
Test suite: tighten assumptions that depend on the ICAT version
b07a326
@RKrahl RKrahl added the enhancement New feature or request label Nov 23, 2022
@RKrahl RKrahl added this to the 1.0.0 milestone Nov 23, 2022
@RKrahl RKrahl merged commit 25028e0 into develop Nov 23, 2022
@RKrahl RKrahl deleted the icat-schema branch November 23, 2022 20:15
@RKrahl RKrahl linked an issue Nov 23, 2022 that may be closed by this pull request
Add support for the ICAT schema extensions expected in icat.server 5.0 #73
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement New feature or request

Projects

None yet

Milestone

1.0.0

Development

Successfully merging this pull request may close these issues.

Add support for the ICAT schema extensions expected in icat.server 5.0

2 participants

@RKrahl