documents: import missing fields from RERODOC

MANIFEST.in

@@ -57,7 +57,7 @@ prune docs/_build
 
 recursive-include _sources *.txt
 recursive-include _static *.css *.js *.png
-recursive-include data *.crt *.json
+recursive-include data *.crt *.json *.csv
 recursive-include docker *.cfg *.conf *.crt *.ini *.key *.pem *.sh
 recursive-include docs *.bat *.py *.rst *.txt Makefile
 recursive-include sonar *.babelrc *.eslintignore *.gitkeep *.json *.html *.js *.scss *.css *.png *.jpg *.svg *.po *.pot *.mo *.py *.txt *.woff *.woff2

data/complete_document_sample.json

@@ -15,20 +15,18 @@
       "type": "bf:Language"
     }
   ],
-  "authors": [
+  "contribution": [
     {
-      "type": "person",
-      "name": "Mancini, Loriano",
-      "date": "1975-03-23",
-      "qualifier": "Librarian"
-    },
-    {
-      "type": "person",
-      "name": "Ronchetti, Elvezio"
-    },
-    {
-      "type": "person",
-      "name": "Trojani, Fabio"
+      "agent": {
+        "type": "bf:Person",
+        "preferred_name": "John, Doe",
+        "date_of_birth": "1960",
+        "date_of_death": "2000"
+      },
+      "role": [
+        "cre"
+      ],
+      "affiliation": "Institute for Research"
     }
   ],
   "title": [
@@ -119,43 +117,31 @@
       ]
     }
   ],
-  "editionStatement": [
-    {
-      "editionDesignation": [
-        {
-          "value": "Di 3 ban"
-        },
-        {
-          "value": "第3版",
-          "language": "chi-hani"
-        }
-      ],
-      "responsibility": [
-        {
-          "value": "Zeng Lingliang zhu bian"
-        },
-        {
-          "value": "曾令良主编",
-          "language": "chi-hani"
-        }
-      ]
+  "editionStatement": {
+    "editionDesignation": {
+      "value": "Di 3 ban"
+    },
+    "responsibility": {
+      "value": "Zeng Lingliang zhu bian"
     }
-  ],
-  "is_part_of": "Is part of",
+  },
   "copyrightDate": [
     "© 1971"
   ],
   "series": [
     {
-    "name": "Collection One",
-    "number": "5"
+      "name": "Collection One",
+      "number": "5"
     },
     {
-    "name": "Collection Two",
-    "number": "123"
+      "name": "Collection Two",
+      "number": "123"
     }
   ],
-  "notes": ["Note 1", "Note 2"],
+  "notes": [
+    "Note 1",
+    "Note 2"
+  ],
   "institution": {
     "$ref": "https://sonar.ch/api/institutions/org"
   }

sonar/config.py

@@ -399,21 +399,15 @@ def _(x):
     dict(aggs=dict(
         institution=dict(terms=dict(field='institution.pid')),
         language=dict(terms=dict(field='language.value')),
-        author__en=dict(terms=dict(field='facet_authors_en')),
-        author__fr=dict(terms=dict(field='facet_authors_fr')),
-        author__de=dict(terms=dict(field='facet_authors_de')),
-        author__it=dict(terms=dict(field='facet_authors_it')),
         subject=dict(terms=dict(field='facet_subjects')),
-        specific_collections=dict(terms=dict(field='specificCollections'))),
+        specific_collections=dict(terms=dict(field='specificCollections')),
+        document_type=dict(terms=dict(field='documentType'))),
          filters={
              _('institution'): terms_filter('institution.pid'),
              _('language'): terms_filter('language.value'),
-             _('author__en'): terms_filter('facet_authors_en'),
-             _('author__fr'): terms_filter('facet_authors_fr'),
-             _('author__de'): terms_filter('facet_authors_de'),
-             _('author__it'): terms_filter('facet_authors_it'),
              _('subject'): terms_filter('facet_subjects'),
              _('specific_collections'): terms_filter('specificCollections'),
+             _('document_type'): terms_filter('documentType')
          }),
     'deposits':
     dict(aggs=dict(status=dict(terms=dict(field='status')),

sonar/modules/deposits/api.py

@@ -135,7 +135,7 @@ def create_document(self):
                     'value': self['metadata']['title']
                 }]
             }],
-            'type':
+            'documentType':
             self['metadata']['document_type'],
             'language': [{
                 'type': 'bf:Language',

sonar/modules/deposits/jsonschemas/deposits/deposit-v1.0.0.json

@@ -91,8 +91,8 @@
           "title": "Type of document",
           "description": "Type of document",
           "type": "string",
-          "default": "preprint",
-          "enum": ["preprint", "postprint"]
+          "default": "coar:c_816b",
+          "enum": ["coar:c_816b", "coar:c_6501"]
         },
         "languages": {
           "title": "Languages",

sonar/modules/documents/api.py

@@ -57,7 +57,7 @@ def get_record_by_identifier(cls, identifiers):
         :param list identifiers: List of identifiers
         """
         for identifier in identifiers:
-            if identifier['type'] == 'bf:Identifier':
+            if identifier['type'] == 'bf:Local':
                 results = list(DocumentSearch().filter(
                     'term', identifiedBy__value=identifier['value']).source(
                         includes=['pid']))