Skip to content

Commit

Permalink
refactor external_field_categories field
Browse files Browse the repository at this point in the history
* Removed external_field_categories.
* Add arxiv_field_categories.
  • Loading branch information
rikirenz committed Dec 5, 2016
1 parent 041fa93 commit 4988dea
Show file tree
Hide file tree
Showing 17 changed files with 1,799 additions and 1,610 deletions.
24 changes: 16 additions & 8 deletions inspire_schemas/records/authors.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@
"type": "array",
"uniqueItems": true
},
"arxiv_field_categories": {
"items": {
"oneOf": [
{
"$ref": "elements/arxiv_field.json"
}
]
},
"type": "array",
"uniqueItems": true
},
"author_note": {
"description": "Contains public note.",
"type": "string"
Expand Down Expand Up @@ -94,13 +105,6 @@
"type": "array",
"uniqueItems": true
},
"external_field_categories": {
"items": {
"$ref": "elements/external_field.json"
},
"type": "array",
"uniqueItems": true
},
"ids": {
"items": {
"$ref": "elements/id.json"
Expand All @@ -110,7 +114,11 @@
},
"inspire_field_categories": {
"items": {
"$ref": "elements/inspire_field.json"
"oneOf": [
{
"$ref": "elements/inspire_field.json"
}
]
},
"type": "array",
"uniqueItems": true
Expand Down
24 changes: 16 additions & 8 deletions inspire_schemas/records/conferences.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@
"type": "array",
"uniqueItems": true
},
"arxiv_field_categories": {
"items": {
"oneOf": [
{
"$ref": "elements/arxiv_field.json"
}
]
},
"type": "array",
"uniqueItems": true
},
"closing_date": {
"format": "date",
"title": "Conference closing date",
Expand All @@ -42,16 +53,13 @@
"deleted": {
"type": "boolean"
},
"external_field_categories": {
"items": {
"$ref": "elements/external_field.json"
},
"type": "array",
"uniqueItems": true
},
"inspire_field_categories": {
"items": {
"$ref": "elements/inspire_field.json"
"oneOf": [
{
"$ref": "elements/inspire_field.json"
}
]
},
"type": "array",
"uniqueItems": true
Expand Down
8 changes: 8 additions & 0 deletions inspire_schemas/records/elements/arxiv_field.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "http://json-schema.org/schema#",
"properties": {
"term": {
"$ref": "arxiv_categories.json"
}
}
}
72 changes: 0 additions & 72 deletions inspire_schemas/records/elements/external_field.json

This file was deleted.

24 changes: 16 additions & 8 deletions inspire_schemas/records/experiments.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@
"type": "array",
"uniqueItems": true
},
"arxiv_field_categories": {
"items": {
"oneOf": [
{
"$ref": "elements/arxiv_field.json"
}
]
},
"type": "array",
"uniqueItems": true
},
"collaboration": {
"title": "Collaboration",
"type": "string"
Expand Down Expand Up @@ -92,13 +103,6 @@
"type": "array",
"uniqueItems": true
},
"external_field_categories": {
"items": {
"$ref": "elements/external_field.json"
},
"type": "array",
"uniqueItems": true
},
"free_keywords": {
"items": {
"title": "Free keyword",
Expand All @@ -114,7 +118,11 @@
},
"inspire_field_categories": {
"items": {
"$ref": "elements/inspire_field.json"
"oneOf": [
{
"$ref": "elements/inspire_field.json"
}
]
},
"type": "array",
"uniqueItems": true
Expand Down
24 changes: 16 additions & 8 deletions inspire_schemas/records/hep.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@
"type": "array",
"uniqueItems": true
},
"arxiv_field_categories": {
"items": {
"oneOf": [
{
"$ref": "elements/arxiv_field.json"
}
]
},
"type": "array",
"uniqueItems": true
},
"authors": {
"description": "List with all the authors",
"items": {
Expand Down Expand Up @@ -373,13 +384,6 @@
},
"type": "array"
},
"external_field_categories": {
"items": {
"$ref": "elements/external_field.json"
},
"type": "array",
"uniqueItems": true
},
"external_system_numbers": {
"items": {
"properties": {
Expand Down Expand Up @@ -465,7 +469,11 @@
},
"inspire_field_categories": {
"items": {
"$ref": "elements/inspire_field.json"
"oneOf": [
{
"$ref": "elements/inspire_field.json"
}
]
},
"type": "array",
"uniqueItems": true
Expand Down
24 changes: 16 additions & 8 deletions inspire_schemas/records/institutions.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@
"type": "array",
"uniqueItems": true
},
"arxiv_field_categories": {
"items": {
"oneOf": [
{
"$ref": "elements/arxiv_field.json"
}
]
},
"type": "array",
"uniqueItems": true
},
"core": {
"description": "Is this a CORE institution?",
"title": "CORE",
Expand All @@ -37,13 +48,6 @@
"title": "Department acronym",
"type": "string"
},
"external_field_categories": {
"items": {
"$ref": "elements/external_field.json"
},
"type": "array",
"uniqueItems": true
},
"extra_words": {
"items": {
"type": "string"
Expand Down Expand Up @@ -82,7 +86,11 @@
},
"inspire_field_categories": {
"items": {
"$ref": "elements/inspire_field.json"
"oneOf": [
{
"$ref": "elements/inspire_field.json"
}
]
},
"type": "array",
"uniqueItems": true
Expand Down
24 changes: 16 additions & 8 deletions inspire_schemas/records/jobs.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@
"type": "array",
"uniqueItems": true
},
"arxiv_field_categories": {
"items": {
"oneOf": [
{
"$ref": "elements/arxiv_field.json"
}
]
},
"type": "array",
"uniqueItems": true
},
"closed_date": {
"format": "date",
"title": "Date when the job was closed",
Expand Down Expand Up @@ -53,16 +64,13 @@
"type": "array",
"uniqueItems": true
},
"external_field_categories": {
"items": {
"$ref": "elements/external_field.json"
},
"type": "array",
"uniqueItems": true
},
"inspire_field_categories": {
"items": {
"$ref": "elements/inspire_field.json"
"oneOf": [
{
"$ref": "elements/inspire_field.json"
}
]
},
"type": "array",
"uniqueItems": true
Expand Down
Loading

0 comments on commit 4988dea

Please sign in to comment.