Skip to content

Commit

Permalink
Merge pull request #379 from michamos/add-ror
Browse files Browse the repository at this point in the history
Add ROR identifiers
  • Loading branch information
michamos committed Sep 18, 2019
2 parents 965302b + ddd501a commit 07bf99b
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 23 deletions.
1 change: 1 addition & 0 deletions inspire_schemas/records/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ properties:
This field is maintained by `invenio-records-files` and should
not be edited manually.
minLength: 1
type: string
_collections:
items:
Expand Down
1 change: 1 addition & 0 deletions inspire_schemas/records/conferences.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ properties:
This field is maintained by `invenio-records-files` and should
not be edited manually.
minLength: 1
type: string
_collections:
items:
Expand Down
1 change: 1 addition & 0 deletions inspire_schemas/records/data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ properties:
This field is maintained by `invenio-records-files` and should
not be edited manually.
minLength: 1
type: string
_collections:
description: |-
Expand Down
6 changes: 3 additions & 3 deletions inspire_schemas/records/elements/records-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ properties:
checksum:
minLength: 1
type: string
file_id:
minLength: 1
type: string
filename:
minLength: 1
type: string
Expand All @@ -19,8 +22,5 @@ properties:
version_id:
minLength: 1
type: string
file_id:
minLength: 1
type: string
title: File schema.
type: object
1 change: 1 addition & 0 deletions inspire_schemas/records/experiments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ properties:
This field is maintained by `invenio-records-files` and should
not be edited manually.
minLength: 1
type: string
_collections:
items:
Expand Down
62 changes: 42 additions & 20 deletions inspire_schemas/records/hep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ properties:
This field is maintained by `invenio-records-files` and should
not be edited manually.
minLength: 1
type: string
_collections:
description: |-
Expand Down Expand Up @@ -296,26 +297,47 @@ properties:
List of identifiers of this institution on external systems.
items:
additionalProperties: false
properties:
schema:
description: |-
:MARC: first part of ``100/700/701__t`` before the :
enum:
- GRID
minLength: 1
type: string
value:
description: |-
:MARC: last part of ``100/700/701__t`` after the :
minLength: 1
pattern: ^grid\.\d+\.\w+$
type: string
required:
- schema
- value
title: GRID identifier
type: object
anyOf:
- additionalProperties: false
properties:
schema:
description: |-
:MARC: first part of ``100/700/701__t`` before the :
enum:
- GRID
minLength: 1
type: string
value:
description: |-
:MARC: last part of ``100/700/701__t`` after the :
minLength: 1
pattern: ^grid\.\d+\.\w+$
type: string
required:
- schema
- value
title: GRID identifier
type: object
- additionalProperties: false
properties:
schema:
description: |-
:MARC: first part of ``100/700/701__t`` before the :
enum:
- ROR
minLength: 1
type: string
value:
description: |-
:MARC: last part of ``100/700/701__t`` after the :
minLength: 1
pattern: ^https://ror\.org/0\w{6}\d{2}$
type: string
required:
- schema
- value
title: ROR identifier
type: object
minItems: 1
type: array
uniqueItems: true
Expand Down
21 changes: 21 additions & 0 deletions inspire_schemas/records/institutions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ properties:
This field is maintained by `invenio-records-files` and should
not be edited manually.
minLength: 1
type: string
_collections:
items:
Expand Down Expand Up @@ -149,6 +150,26 @@ properties:
- value
title: HAL identifier
type: object
- additionalProperties: false
properties:
schema:
description: |-
:MARC: ``035__9:ROR``
enum:
- ROR
minLength: 1
type: string
value:
description: |-
:MARC: ``035__a``
minLength: 1
pattern: ^https://ror\.org/0\w{6}\d{2}$
type: string
required:
- schema
- value
title: ROR identifier
type: object
- additionalProperties: false
properties:
schema:
Expand Down
1 change: 1 addition & 0 deletions inspire_schemas/records/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ properties:
This field is maintained by `invenio-records-files` and should
not be edited manually.
minLength: 1
type: string
_collections:
items:
Expand Down
1 change: 1 addition & 0 deletions inspire_schemas/records/journals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ properties:
This field is maintained by `invenio-records-files` and should
not be edited manually.
minLength: 1
type: string
_collections:
items:
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/fixtures/hep_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
{
"schema": "GRID",
"value": "grid.440804.c"
},
{
"schema": "ROR",
"value": "https://ror.org/03yrm5c26"
}
],
"alternative_names": [
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/fixtures/institutions_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@
{
"schema": "SPIRES",
"value": "INST-64882508"
},
{
"schema": "ROR",
"value": "https://ror.org/03yrm5c26"
}
],
"extra_words": [
Expand Down

0 comments on commit 07bf99b

Please sign in to comment.