datacite: adding datacite-specific extra metadata

* attributes.metadataVersion
* attributes.schemaVersion
* attributes.version (source dependent values, follows suggestions in
https://schema.datacite.org/meta/kernel-4.3/doc/DataCite-MetadataKernel_v4.3.pdf#page=26,
but values vary)

Furthermore:

* attributes.types.resourceTypeGeneral
* attributes.types.resourceType

1 files changed, 65 insertions, 63 deletions

diff --git a/python/tests/files/datacite/datacite_result_07.json b/python/tests/files/datacite/datacite_result_07.json
index f694ddef..23b63d50 100644
--- a/python/tests/files/datacite/datacite_result_07.json
+++ b/python/tests/files/datacite/datacite_result_07.json
@@ -1,74 +1,76 @@
 {
-    "extra": {
-        "datacite": {
-            "subjects": [
-                {
-                    "subject": "HEAT PUMP"
-                },
-                {
-                    "subject": "HOT WATER"
-                },
-                {
-                    "subject": "HEAT TRANSFER"
-                },
-                {
-                    "subject": "PERFORMANCE"
-                },
-                {
-                    "subject": "THERMAL STORAGE"
-                },
-                {
-                    "subject": "TANK"
-                },
-                {
-                    "subject": "MODEL"
-                }
-            ]
-        }
-    },
-    "title": "High efficient heat pump system using storage tanks to increase cop by means of the ISEC concept. 1: model validation.",
-    "release_type": "dataset",
-    "release_stage": "published",
-    "release_year": 2015,
-    "ext_ids": {
-        "doi": "10.18462/iir.icr.2015.0926"
-    },
-    "publisher": "International Institute of Refrigeration (IIR)",
-    "language": "en",
-    "contribs": [
+  "extra": {
+    "datacite": {
+      "subjects": [
         {
-            "index": 0,
-            "raw_name": "E. ROTHUIZEN",
-            "given_name": "E.",
-            "surname": "ROTHUIZEN",
-            "role": "author"
+          "subject": "HEAT PUMP"
         },
         {
-            "index": 1,
-            "raw_name": "B. ELMEGAARD",
-            "given_name": "B.",
-            "surname": "ELMEGAARD",
-            "role": "author"
+          "subject": "HOT WATER"
         },
         {
-            "index": 2,
-            "raw_name": "B. MARKUSSEN W.",
-            "given_name": "B.",
-            "surname": "MARKUSSEN W.",
-            "role": "author"
+          "subject": "HEAT TRANSFER"
         },
         {
-            "index": 3,
-            "raw_name": "Et Al.",
-            "role": "author"
-        }
-    ],
-    "refs": [],
-    "abstracts": [
+          "subject": "PERFORMANCE"
+        },
+        {
+          "subject": "THERMAL STORAGE"
+        },
+        {
+          "subject": "TANK"
+        },
         {
-            "content": "The purpose of the ISEC concept is to provide a high-efficient heat pump system for hot water production. The ISEC concept uses two storage tanks for the water, one discharged and one charged. Hot water for the industrial process is tapped from the charged tank, while the other tank is charging. Charging is done by circulating the water in the tank through the condenser of a heat pump several times and thereby gradually heating the water. The charging is done with a higher mass flow rate than the discharging to reach several circulations of the water during the time frame of one discharging. This result in a lower condensing temperature than if the water was heated in one step. Two test setups were built, one to test the performance of the heat pump gradually heating the water and one to investigate the stratification in the storage tanks. Furthermore, a dynamic model of the system was implemented in Dymola, and validated by the use of test data from the two experimental setups. This paper shows that there is a good consistency between the model and the experimental tests.",
-            "mimetype": "text/plain",
-            "lang": "en"
+          "subject": "MODEL"
         }
-    ]
+      ],
+      "resourceType": "Dataset",
+      "resourceTypeGeneral": "Dataset"
+    }
+  },
+  "title": "High efficient heat pump system using storage tanks to increase cop by means of the ISEC concept. 1: model validation.",
+  "release_type": "dataset",
+  "release_stage": "published",
+  "release_year": 2015,
+  "ext_ids": {
+    "doi": "10.18462/iir.icr.2015.0926"
+  },
+  "publisher": "International Institute of Refrigeration (IIR)",
+  "language": "en",
+  "contribs": [
+    {
+      "index": 0,
+      "raw_name": "E. ROTHUIZEN",
+      "given_name": "E.",
+      "surname": "ROTHUIZEN",
+      "role": "author"
+    },
+    {
+      "index": 1,
+      "raw_name": "B. ELMEGAARD",
+      "given_name": "B.",
+      "surname": "ELMEGAARD",
+      "role": "author"
+    },
+    {
+      "index": 2,
+      "raw_name": "B. MARKUSSEN W.",
+      "given_name": "B.",
+      "surname": "MARKUSSEN W.",
+      "role": "author"
+    },
+    {
+      "index": 3,
+      "raw_name": "Et Al.",
+      "role": "author"
+    }
+  ],
+  "refs": [],
+  "abstracts": [
+    {
+      "content": "The purpose of the ISEC concept is to provide a high-efficient heat pump system for hot water production. The ISEC concept uses two storage tanks for the water, one discharged and one charged. Hot water for the industrial process is tapped from the charged tank, while the other tank is charging. Charging is done by circulating the water in the tank through the condenser of a heat pump several times and thereby gradually heating the water. The charging is done with a higher mass flow rate than the discharging to reach several circulations of the water during the time frame of one discharging. This result in a lower condensing temperature than if the water was heated in one step. Two test setups were built, one to test the performance of the heat pump gradually heating the water and one to investigate the stratification in the storage tanks. Furthermore, a dynamic model of the system was implemented in Dymola, and validated by the use of test data from the two experimental setups. This paper shows that there is a good consistency between the model and the experimental tests.",
+      "mimetype": "text/plain",
+      "lang": "en"
+    }
+  ]
 }