refactor external_field_categories field

* Removed external_field_categories. * Add arxiv_field_categories.
inspirehep · Dec 5, 2016 · c095f17 · c095f17
1 parent dd57da6
commit c095f17
Show file tree

Hide file tree

Showing 16 changed files with 1,496 additions and 1,785 deletions.
diff --git a/inspire_schemas/records/authors.json b/inspire_schemas/records/authors.json
@@ -31,6 +31,17 @@
             "type": "array",
             "uniqueItems": true
         },
+        "arxiv_field_categories": {
+            "items": {
+                "oneOf": [
+                    {
+                        "$ref": "elements/arxiv_categories.json"
+                    }
+                ]
+            },
+            "type": "array",
+            "uniqueItems": true
+        },
         "author_note": {
             "description": "Contains public note.",
             "type": "string"
@@ -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"
@@ -110,7 +114,11 @@
         },
         "inspire_field_categories": {
             "items": {
-                "$ref": "elements/inspire_field.json"
+                "oneOf": [
+                    {
+                        "$ref": "elements/inspire_field.json"
+                    }
+                ]
             },
             "type": "array",
             "uniqueItems": true

diff --git a/inspire_schemas/records/conferences.json b/inspire_schemas/records/conferences.json
@@ -22,6 +22,17 @@
             "type": "array",
             "uniqueItems": true
         },
+        "arxiv_field_categories": {
+            "items": {
+                "oneOf": [
+                    {
+                        "$ref": "elements/arxiv_categories.json"
+                    }
+                ]
+            },
+            "type": "array",
+            "uniqueItems": true
+        },
         "closing_date": {
             "format": "date",
             "title": "Conference closing date",
@@ -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

diff --git a/inspire_schemas/records/elements/external_field.json b/inspire_schemas/records/elements/external_field.json
diff --git a/inspire_schemas/records/elements/inspire_field.json b/inspire_schemas/records/elements/inspire_field.json
@@ -1,25 +1,21 @@
 {
     "$schema": "http://json-schema.org/schema#",
-    "properties": {
-        "term": {
-            "enum": [
-                "Accelerators",
-                "Astrophysics",
-                "Computing",
-                "Data Analysis and Statistics",
-                "Experiment-HEP",
-                "Experiment-Nucl",
-                "General Physics",
-                "Gravitation and Cosmology",
-                "Instrumentation",
-                "Lattice",
-                "Math and Math Physics",
-                "Other",
-                "Phenomenology-HEP",
-                "Theory-HEP",
-                "Theory-Nucl"
-            ],
-            "type": "string"
-        }
-    }
+    "enum": [
+        "Accelerators",
+        "Astrophysics",
+        "Computing",
+        "Data Analysis and Statistics",
+        "Experiment-HEP",
+        "Experiment-Nucl",
+        "General Physics",
+        "Gravitation and Cosmology",
+        "Instrumentation",
+        "Lattice",
+        "Math and Math Physics",
+        "Other",
+        "Phenomenology-HEP",
+        "Theory-HEP",
+        "Theory-Nucl"
+    ],
+    "type": "string"
 }
diff --git a/inspire_schemas/records/experiments.json b/inspire_schemas/records/experiments.json
@@ -26,6 +26,17 @@
             "type": "array",
             "uniqueItems": true
         },
+        "arxiv_field_categories": {
+            "items": {
+                "oneOf": [
+                    {
+                        "$ref": "elements/arxiv_categories.json"
+                    }
+                ]
+            },
+            "type": "array",
+            "uniqueItems": true
+        },
         "collaboration": {
             "title": "Collaboration",
             "type": "string"
@@ -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",
@@ -114,7 +118,11 @@
         },
         "inspire_field_categories": {
             "items": {
-                "$ref": "elements/inspire_field.json"
+                "oneOf": [
+                    {
+                        "$ref": "elements/inspire_field.json"
+                    }
+                ]
             },
             "type": "array",
             "uniqueItems": true

diff --git a/inspire_schemas/records/hep.json b/inspire_schemas/records/hep.json
@@ -70,6 +70,17 @@
             "type": "array",
             "uniqueItems": true
         },
+        "arxiv_field_categories": {
+            "items": {
+                "oneOf": [
+                    {
+                        "$ref": "elements/arxiv_categories.json"
+                    }
+                ]
+            },
+            "type": "array",
+            "uniqueItems": true
+        },
         "authors": {
             "description": "List with all the authors",
             "items": {
@@ -373,13 +384,6 @@
             },
             "type": "array"
         },
-        "external_field_categories": {
-            "items": {
-                "$ref": "elements/external_field.json"
-            },
-            "type": "array",
-            "uniqueItems": true
-        },
         "external_system_numbers": {
             "items": {
                 "properties": {
@@ -465,7 +469,11 @@
         },
         "inspire_field_categories": {
             "items": {
-                "$ref": "elements/inspire_field.json"
+                "oneOf": [
+                    {
+                        "$ref": "elements/inspire_field.json"
+                    }
+                ]
             },
             "type": "array",
             "uniqueItems": true

diff --git a/inspire_schemas/records/institutions.json b/inspire_schemas/records/institutions.json
@@ -16,6 +16,17 @@
             "type": "array",
             "uniqueItems": true
         },
+        "arxiv_field_categories": {
+            "items": {
+                "oneOf": [
+                    {
+                        "$ref": "elements/arxiv_categories.json"
+                    }
+                ]
+            },
+            "type": "array",
+            "uniqueItems": true
+        },
         "core": {
             "description": "Is this a CORE institution?",
             "title": "CORE",
@@ -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"
@@ -82,7 +86,11 @@
         },
         "inspire_field_categories": {
             "items": {
-                "$ref": "elements/inspire_field.json"
+                "oneOf": [
+                    {
+                        "$ref": "elements/inspire_field.json"
+                    }
+                ]
             },
             "type": "array",
             "uniqueItems": true

diff --git a/inspire_schemas/records/jobs.json b/inspire_schemas/records/jobs.json
@@ -8,6 +8,17 @@
             "type": "array",
             "uniqueItems": true
         },
+        "arxiv_field_categories": {
+            "items": {
+                "oneOf": [
+                    {
+                        "$ref": "elements/arxiv_categories.json"
+                    }
+                ]
+            },
+            "type": "array",
+            "uniqueItems": true
+        },
         "closed_date": {
             "format": "date",
             "title": "Date when the job was closed",
@@ -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