diff options
| -rw-r--r-- | python_client/fatcat_client/models/container_entity.py | 82 | ||||
| -rw-r--r-- | python_client/fatcat_client/models/release_contrib.py | 84 | ||||
| -rw-r--r-- | python_client/fatcat_client/models/release_entity.py | 114 | ||||
| -rw-r--r-- | rust/fatcat-api-spec/README.md | 2 | ||||
| -rw-r--r-- | rust/fatcat-api-spec/api.yaml | 32 | ||||
| -rw-r--r-- | rust/fatcat-api-spec/api/swagger.yaml | 51 | ||||
| -rw-r--r-- | rust/fatcat-api-spec/src/models.rs | 56 |
7 files changed, 297 insertions, 124 deletions
diff --git a/python_client/fatcat_client/models/container_entity.py b/python_client/fatcat_client/models/container_entity.py index 5ed7eb0a..f5a054c5 100644 --- a/python_client/fatcat_client/models/container_entity.py +++ b/python_client/fatcat_client/models/container_entity.py @@ -31,11 +31,10 @@ class ContainerEntity(object): and the value is json key in definition. """ swagger_types = { - 'coden': 'str', - 'abbrev': 'str', 'wikidata_qid': 'str', 'issnl': 'str', 'publisher': 'str', + 'container_type': 'str', 'name': 'str', 'edit_extra': 'object', 'extra': 'object', @@ -46,11 +45,10 @@ class ContainerEntity(object): } attribute_map = { - 'coden': 'coden', - 'abbrev': 'abbrev', 'wikidata_qid': 'wikidata_qid', 'issnl': 'issnl', 'publisher': 'publisher', + 'container_type': 'container_type', 'name': 'name', 'edit_extra': 'edit_extra', 'extra': 'extra', @@ -60,14 +58,13 @@ class ContainerEntity(object): 'state': 'state' } - def __init__(self, coden=None, abbrev=None, wikidata_qid=None, issnl=None, publisher=None, name=None, edit_extra=None, extra=None, redirect=None, revision=None, ident=None, state=None): # noqa: E501 + def __init__(self, wikidata_qid=None, issnl=None, publisher=None, container_type=None, name=None, edit_extra=None, extra=None, redirect=None, revision=None, ident=None, state=None): # noqa: E501 """ContainerEntity - a model defined in Swagger""" # noqa: E501 - self._coden = None - self._abbrev = None self._wikidata_qid = None self._issnl = None self._publisher = None + self._container_type = None self._name = None self._edit_extra = None self._extra = None @@ -77,16 +74,14 @@ class ContainerEntity(object): self._state = None self.discriminator = None - if coden is not None: - self.coden = coden - if abbrev is not None: - self.abbrev = abbrev if wikidata_qid is not None: self.wikidata_qid = wikidata_qid if issnl is not None: self.issnl = issnl if publisher is not None: self.publisher = publisher + if container_type is not None: + self.container_type = container_type if name is not None: self.name = name if edit_extra is not None: @@ -103,48 +98,6 @@ class ContainerEntity(object): self.state = state @property - def coden(self): - """Gets the coden of this ContainerEntity. # noqa: E501 - - - :return: The coden of this ContainerEntity. # noqa: E501 - :rtype: str - """ - return self._coden - - @coden.setter - def coden(self, coden): - """Sets the coden of this ContainerEntity. - - - :param coden: The coden of this ContainerEntity. # noqa: E501 - :type: str - """ - - self._coden = coden - - @property - def abbrev(self): - """Gets the abbrev of this ContainerEntity. # noqa: E501 - - - :return: The abbrev of this ContainerEntity. # noqa: E501 - :rtype: str - """ - return self._abbrev - - @abbrev.setter - def abbrev(self, abbrev): - """Sets the abbrev of this ContainerEntity. - - - :param abbrev: The abbrev of this ContainerEntity. # noqa: E501 - :type: str - """ - - self._abbrev = abbrev - - @property def wikidata_qid(self): """Gets the wikidata_qid of this ContainerEntity. # noqa: E501 @@ -214,6 +167,29 @@ class ContainerEntity(object): self._publisher = publisher @property + def container_type(self): + """Gets the container_type of this ContainerEntity. # noqa: E501 + + Eg, 'journal' # noqa: E501 + + :return: The container_type of this ContainerEntity. # noqa: E501 + :rtype: str + """ + return self._container_type + + @container_type.setter + def container_type(self, container_type): + """Sets the container_type of this ContainerEntity. + + Eg, 'journal' # noqa: E501 + + :param container_type: The container_type of this ContainerEntity. # noqa: E501 + :type: str + """ + + self._container_type = container_type + + @property def name(self): """Gets the name of this ContainerEntity. # noqa: E501 diff --git a/python_client/fatcat_client/models/release_contrib.py b/python_client/fatcat_client/models/release_contrib.py index a06b0e66..e823e43e 100644 --- a/python_client/fatcat_client/models/release_contrib.py +++ b/python_client/fatcat_client/models/release_contrib.py @@ -37,8 +37,9 @@ class ReleaseContrib(object): 'creator_id': 'str', 'creator': 'CreatorEntity', 'raw_name': 'str', - 'extra': 'object', - 'role': 'str' + 'role': 'str', + 'raw_affiliation': 'str', + 'extra': 'object' } attribute_map = { @@ -46,19 +47,21 @@ class ReleaseContrib(object): 'creator_id': 'creator_id', 'creator': 'creator', 'raw_name': 'raw_name', - 'extra': 'extra', - 'role': 'role' + 'role': 'role', + 'raw_affiliation': 'raw_affiliation', + 'extra': 'extra' } - def __init__(self, index=None, creator_id=None, creator=None, raw_name=None, extra=None, role=None): # noqa: E501 + def __init__(self, index=None, creator_id=None, creator=None, raw_name=None, role=None, raw_affiliation=None, extra=None): # noqa: E501 """ReleaseContrib - a model defined in Swagger""" # noqa: E501 self._index = None self._creator_id = None self._creator = None self._raw_name = None - self._extra = None self._role = None + self._raw_affiliation = None + self._extra = None self.discriminator = None if index is not None: @@ -69,10 +72,12 @@ class ReleaseContrib(object): self.creator = creator if raw_name is not None: self.raw_name = raw_name - if extra is not None: - self.extra = extra if role is not None: self.role = role + if raw_affiliation is not None: + self.raw_affiliation = raw_affiliation + if extra is not None: + self.extra = extra @property def index(self): @@ -161,46 +166,69 @@ class ReleaseContrib(object): self._raw_name = raw_name @property - def extra(self): - """Gets the extra of this ReleaseContrib. # noqa: E501 + def role(self): + """Gets the role of this ReleaseContrib. # noqa: E501 - :return: The extra of this ReleaseContrib. # noqa: E501 - :rtype: object + :return: The role of this ReleaseContrib. # noqa: E501 + :rtype: str """ - return self._extra + return self._role - @extra.setter - def extra(self, extra): - """Sets the extra of this ReleaseContrib. + @role.setter + def role(self, role): + """Sets the role of this ReleaseContrib. - :param extra: The extra of this ReleaseContrib. # noqa: E501 - :type: object + :param role: The role of this ReleaseContrib. # noqa: E501 + :type: str """ - self._extra = extra + self._role = role @property - def role(self): - """Gets the role of this ReleaseContrib. # noqa: E501 + def raw_affiliation(self): + """Gets the raw_affiliation of this ReleaseContrib. # noqa: E501 + Raw affiliation string as displayed in text # noqa: E501 - :return: The role of this ReleaseContrib. # noqa: E501 + :return: The raw_affiliation of this ReleaseContrib. # noqa: E501 :rtype: str """ - return self._role + return self._raw_affiliation - @role.setter - def role(self, role): - """Sets the role of this ReleaseContrib. + @raw_affiliation.setter + def raw_affiliation(self, raw_affiliation): + """Sets the raw_affiliation of this ReleaseContrib. + Raw affiliation string as displayed in text # noqa: E501 - :param role: The role of this ReleaseContrib. # noqa: E501 + :param raw_affiliation: The raw_affiliation of this ReleaseContrib. # noqa: E501 :type: str """ - self._role = role + self._raw_affiliation = raw_affiliation + + @property + def extra(self): + """Gets the extra of this ReleaseContrib. # noqa: E501 + + + :return: The extra of this ReleaseContrib. # noqa: E501 + :rtype: object + """ + return self._extra + + @extra.setter + def extra(self, extra): + """Sets the extra of this ReleaseContrib. + + + :param extra: The extra of this ReleaseContrib. # noqa: E501 + :type: object + """ + + self._extra = extra def to_dict(self): """Returns the model properties as a dict""" diff --git a/python_client/fatcat_client/models/release_entity.py b/python_client/fatcat_client/models/release_entity.py index 83648351..5df97e50 100644 --- a/python_client/fatcat_client/models/release_entity.py +++ b/python_client/fatcat_client/models/release_entity.py @@ -42,11 +42,14 @@ class ReleaseEntity(object): 'abstracts': 'list[ReleaseEntityAbstracts]', 'refs': 'list[ReleaseRef]', 'contribs': 'list[ReleaseContrib]', + 'license_slug': 'str', 'language': 'str', 'publisher': 'str', 'pages': 'str', 'issue': 'str', 'volume': 'str', + 'jstor_id': 'str', + 'arxiv_id': 'str', 'core_id': 'str', 'pmcid': 'str', 'pmid': 'str', @@ -63,6 +66,7 @@ class ReleaseEntity(object): 'files': 'list[FileEntity]', 'container': 'ContainerEntity', 'work_id': 'str', + 'original_title': 'str', 'title': 'str', 'state': 'str', 'ident': 'str', @@ -76,11 +80,14 @@ class ReleaseEntity(object): 'abstracts': 'abstracts', 'refs': 'refs', 'contribs': 'contribs', + 'license_slug': 'license_slug', 'language': 'language', 'publisher': 'publisher', 'pages': 'pages', 'issue': 'issue', 'volume': 'volume', + 'jstor_id': 'jstor_id', + 'arxiv_id': 'arxiv_id', 'core_id': 'core_id', 'pmcid': 'pmcid', 'pmid': 'pmid', @@ -97,6 +104,7 @@ class ReleaseEntity(object): 'files': 'files', 'container': 'container', 'work_id': 'work_id', + 'original_title': 'original_title', 'title': 'title', 'state': 'state', 'ident': 'ident', @@ -106,17 +114,20 @@ class ReleaseEntity(object): 'edit_extra': 'edit_extra' } - def __init__(self, abstracts=None, refs=None, contribs=None, language=None, publisher=None, pages=None, issue=None, volume=None, core_id=None, pmcid=None, pmid=None, isbn13=None, wikidata_qid=None, doi=None, release_year=None, release_date=None, release_status=None, release_type=None, container_id=None, webcaptures=None, filesets=None, files=None, container=None, work_id=None, title=None, state=None, ident=None, revision=None, redirect=None, extra=None, edit_extra=None): # noqa: E501 + def __init__(self, abstracts=None, refs=None, contribs=None, license_slug=None, language=None, publisher=None, pages=None, issue=None, volume=None, jstor_id=None, arxiv_id=None, core_id=None, pmcid=None, pmid=None, isbn13=None, wikidata_qid=None, doi=None, release_year=None, release_date=None, release_status=None, release_type=None, container_id=None, webcaptures=None, filesets=None, files=None, container=None, work_id=None, original_title=None, title=None, state=None, ident=None, revision=None, redirect=None, extra=None, edit_extra=None): # noqa: E501 """ReleaseEntity - a model defined in Swagger""" # noqa: E501 self._abstracts = None self._refs = None self._contribs = None + self._license_slug = None self._language = None self._publisher = None self._pages = None self._issue = None self._volume = None + self._jstor_id = None + self._arxiv_id = None self._core_id = None self._pmcid = None self._pmid = None @@ -133,6 +144,7 @@ class ReleaseEntity(object): self._files = None self._container = None self._work_id = None + self._original_title = None self._title = None self._state = None self._ident = None @@ -148,6 +160,8 @@ class ReleaseEntity(object): self.refs = refs if contribs is not None: self.contribs = contribs + if license_slug is not None: + self.license_slug = license_slug if language is not None: self.language = language if publisher is not None: @@ -158,6 +172,10 @@ class ReleaseEntity(object): self.issue = issue if volume is not None: self.volume = volume + if jstor_id is not None: + self.jstor_id = jstor_id + if arxiv_id is not None: + self.arxiv_id = arxiv_id if core_id is not None: self.core_id = core_id if pmcid is not None: @@ -190,6 +208,8 @@ class ReleaseEntity(object): self.container = container if work_id is not None: self.work_id = work_id + if original_title is not None: + self.original_title = original_title if title is not None: self.title = title if state is not None: @@ -269,6 +289,29 @@ class ReleaseEntity(object): self._contribs = contribs @property + def license_slug(self): + """Gets the license_slug of this ReleaseEntity. # noqa: E501 + + Short version of license name. Eg, 'CC-BY' # noqa: E501 + + :return: The license_slug of this ReleaseEntity. # noqa: E501 + :rtype: str + """ + return self._license_slug + + @license_slug.setter + def license_slug(self, license_slug): + """Sets the license_slug of this ReleaseEntity. + + Short version of license name. Eg, 'CC-BY' # noqa: E501 + + :param license_slug: The license_slug of this ReleaseEntity. # noqa: E501 + :type: str + """ + + self._license_slug = license_slug + + @property def language(self): """Gets the language of this ReleaseEntity. # noqa: E501 @@ -376,6 +419,48 @@ class ReleaseEntity(object): self._volume = volume @property + def jstor_id(self): + """Gets the jstor_id of this ReleaseEntity. # noqa: E501 + + + :return: The jstor_id of this ReleaseEntity. # noqa: E501 + :rtype: str + """ + return self._jstor_id + + @jstor_id.setter + def jstor_id(self, jstor_id): + """Sets the jstor_id of this ReleaseEntity. + + + :param jstor_id: The jstor_id of this ReleaseEntity. # noqa: E501 + :type: str + """ + + self._jstor_id = jstor_id + + @property + def arxiv_id(self): + """Gets the arxiv_id of this ReleaseEntity. # noqa: E501 + + + :return: The arxiv_id of this ReleaseEntity. # noqa: E501 + :rtype: str + """ + return self._arxiv_id + + @arxiv_id.setter + def arxiv_id(self, arxiv_id): + """Sets the arxiv_id of this ReleaseEntity. + + + :param arxiv_id: The arxiv_id of this ReleaseEntity. # noqa: E501 + :type: str + """ + + self._arxiv_id = arxiv_id + + @property def core_id(self): """Gets the core_id of this ReleaseEntity. # noqa: E501 @@ -720,10 +805,33 @@ class ReleaseEntity(object): self._work_id = work_id @property + def original_title(self): + """Gets the original_title of this ReleaseEntity. # noqa: E501 + + Title in original language (or, the language of the full text of this release) # noqa: E501 + + :return: The original_title of this ReleaseEntity. # noqa: E501 + :rtype: str + """ + return self._original_title + + @original_title.setter + def original_title(self, original_title): + """Sets the original_title of this ReleaseEntity. + + Title in original language (or, the language of the full text of this release) # noqa: E501 + + :param original_title: The original_title of this ReleaseEntity. # noqa: E501 + :type: str + """ + + self._original_title = original_title + + @property def title(self): """Gets the title of this ReleaseEntity. # noqa: E501 - Required for valid entities # noqa: E501 + Required for valid entities. The title used in citations and for display; usually English # noqa: E501 :return: The title of this ReleaseEntity. # noqa: E501 :rtype: str @@ -734,7 +842,7 @@ class ReleaseEntity(object): def title(self, title): """Sets the title of this ReleaseEntity. - Required for valid entities # noqa: E501 + Required for valid entities. The title used in citations and for display; usually English # noqa: E501 :param title: The title of this ReleaseEntity. # noqa: E501 :type: str diff --git a/rust/fatcat-api-spec/README.md b/rust/fatcat-api-spec/README.md index 99522241..a55ad337 100644 --- a/rust/fatcat-api-spec/README.md +++ b/rust/fatcat-api-spec/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 0.1.0 -- Build date: 2019-01-18T22:02:14.046Z +- Build date: 2019-01-21T19:59:50.253Z This autogenerated project defines an API crate `fatcat` which contains: * An `Api` trait defining the API in Rust. diff --git a/rust/fatcat-api-spec/api.yaml b/rust/fatcat-api-spec/api.yaml index b35d918e..0a5391c8 100644 --- a/rust/fatcat-api-spec/api.yaml +++ b/rust/fatcat-api-spec/api.yaml @@ -26,6 +26,10 @@ tags: # TAGLINE descriptions: "Creator entities: such as authors" # TAGLINE - name: files # TAGLINE descriptions: "File entities" # TAGLINE + - name: filesets # TAGLINE + descriptions: "Fileset entities" # TAGLINE + - name: webcaptures # TAGLINE + descriptions: "Webcapture entities" # TAGLINE - name: releases # TAGLINE descriptions: "Release entities: individual articles, pre-prints, books" # TAGLINE - name: works # TAGLINE @@ -132,6 +136,9 @@ definitions: type: string example: "Journal of Important Results" description: "Required for valid entities" + container_type: + type: string + description: "Eg, 'journal'" publisher: type: string example: "Society of Curious Students" @@ -139,10 +146,6 @@ definitions: <<: *FATCATISSN wikidata_qid: type: string - abbrev: - type: string - coden: - type: string creator_entity: type: object # required for creation: display_name @@ -316,7 +319,10 @@ definitions: <<: *ENTITYPROPS title: type: string - description: "Required for valid entities" + description: "Required for valid entities. The title used in citations and for display; usually English" + original_title: + type: string + description: "Title in original language (or, the language of the full text of this release)" work_id: type: string example: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -346,7 +352,7 @@ definitions: example: "book" release_status: type: string - example: "preprint" + example: "preprint, retracted" release_date: type: string format: date @@ -370,6 +376,10 @@ definitions: core_id: type: string #format: custom + arxiv_id: + type: string + jstor_id: + type: string volume: type: string issue: @@ -382,6 +392,9 @@ definitions: language: description: "Two-letter RFC1766/ISO639-1 language code, with extensions" type: string + license_slug: + type: string + description: "Short version of license name. Eg, 'CC-BY'" contribs: type: array items: @@ -591,11 +604,14 @@ definitions: description: "Optional; GET-only" raw_name: type: string + role: + type: string + raw_affiliation: + type: string + description: "Raw affiliation string as displayed in text" extra: type: object additionalProperties: {} - role: - type: string auth_oidc: type: object required: diff --git a/rust/fatcat-api-spec/api/swagger.yaml b/rust/fatcat-api-spec/api/swagger.yaml index 98f34751..989ca0ab 100644 --- a/rust/fatcat-api-spec/api/swagger.yaml +++ b/rust/fatcat-api-spec/api/swagger.yaml @@ -11,6 +11,8 @@ tags: - name: "containers" - name: "creators" - name: "files" +- name: "filesets" +- name: "webcaptures" - name: "releases" - name: "works" - name: "edit-lifecycle" @@ -7273,10 +7275,6 @@ definitions: container_entity: type: "object" properties: - coden: - type: "string" - abbrev: - type: "string" wikidata_qid: type: "string" issnl: @@ -7288,6 +7286,9 @@ definitions: publisher: type: "string" example: "Society of Curious Students" + container_type: + type: "string" + description: "Eg, 'journal'" name: type: "string" example: "Journal of Important Results" @@ -7326,13 +7327,12 @@ definitions: - "deleted" example: redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" - coden: "coden" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" extra: "{}" + container_type: "container_type" name: "Journal of Important Results" publisher: "Society of Curious Students" issnl: "1234-5678" - abbrev: "abbrev" wikidata_qid: "wikidata_qid" state: "wip" edit_extra: "{}" @@ -7687,6 +7687,9 @@ definitions: type: "array" items: $ref: "#/definitions/release_contrib" + license_slug: + type: "string" + description: "Short version of license name. Eg, 'CC-BY'" language: type: "string" description: "Two-letter RFC1766/ISO639-1 language code, with extensions" @@ -7699,6 +7702,10 @@ definitions: example: "12" volume: type: "string" + jstor_id: + type: "string" + arxiv_id: + type: "string" core_id: type: "string" pmcid: @@ -7721,7 +7728,7 @@ definitions: format: "date" release_status: type: "string" - example: "preprint" + example: "preprint, retracted" release_type: type: "string" example: "book" @@ -7749,9 +7756,14 @@ definitions: work_id: type: "string" example: "q3nouwy3nnbsvo3h5klxsx4a7y" + original_title: + type: "string" + description: "Title in original language (or, the language of the full text\ + \ of this release)" title: type: "string" - description: "Required for valid entities" + description: "Required for valid entities. The title used in citations and\ + \ for display; usually English" state: type: "string" enum: @@ -7787,13 +7799,12 @@ definitions: example: container: redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" - coden: "coden" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" extra: "{}" + container_type: "container_type" name: "Journal of Important Results" publisher: "Society of Curious Students" issnl: "1234-5678" - abbrev: "abbrev" wikidata_qid: "wikidata_qid" state: "wip" edit_extra: "{}" @@ -7865,7 +7876,8 @@ definitions: language: "language" title: "title" contribs: - - creator: + - raw_affiliation: "raw_affiliation" + creator: redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" surname: "surname" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7882,7 +7894,8 @@ definitions: extra: "{}" creator_id: "creator_id" index: 1 - - creator: + - raw_affiliation: "raw_affiliation" + creator: redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" surname: "surname" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7904,9 +7917,11 @@ definitions: extra: "{}" state: "wip" edit_extra: "{}" + jstor_id: "jstor_id" redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" work_id: "q3nouwy3nnbsvo3h5klxsx4a7y" issue: "12" + original_title: "original_title" abstracts: - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" mimetype: "application/xml+jats" @@ -7920,9 +7935,10 @@ definitions: release_type: "book" wikidata_qid: "wikidata_qid" pmid: "pmid" - release_status: "preprint" + release_status: "preprint, retracted" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" volume: "volume" + license_slug: "license_slug" refs: - target_release_id: "q3nouwy3nnbsvo3h5klxsx4a7y" container_name: "container_name" @@ -7982,6 +7998,7 @@ definitions: - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" md5: "1b39813549077b2347c0f370c3864b40" + arxiv_id: "arxiv_id" filesets: - redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" urls: @@ -8932,11 +8949,15 @@ definitions: $ref: "#/definitions/creator_entity" raw_name: type: "string" - extra: - type: "object" role: type: "string" + raw_affiliation: + type: "string" + description: "Raw affiliation string as displayed in text" + extra: + type: "object" example: + raw_affiliation: "raw_affiliation" creator: redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" surname: "surname" diff --git a/rust/fatcat-api-spec/src/models.rs b/rust/fatcat-api-spec/src/models.rs index 1a34dd48..d6e6e07f 100644 --- a/rust/fatcat-api-spec/src/models.rs +++ b/rust/fatcat-api-spec/src/models.rs @@ -79,14 +79,6 @@ impl ChangelogEntry { #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct ContainerEntity { - #[serde(rename = "coden")] - #[serde(skip_serializing_if = "Option::is_none")] - pub coden: Option<String>, - - #[serde(rename = "abbrev")] - #[serde(skip_serializing_if = "Option::is_none")] - pub abbrev: Option<String>, - #[serde(rename = "wikidata_qid")] #[serde(skip_serializing_if = "Option::is_none")] pub wikidata_qid: Option<String>, @@ -99,6 +91,11 @@ pub struct ContainerEntity { #[serde(skip_serializing_if = "Option::is_none")] pub publisher: Option<String>, + /// Eg, 'journal' + #[serde(rename = "container_type")] + #[serde(skip_serializing_if = "Option::is_none")] + pub container_type: Option<String>, + /// Required for valid entities #[serde(rename = "name")] #[serde(skip_serializing_if = "Option::is_none")] @@ -136,11 +133,10 @@ pub struct ContainerEntity { impl ContainerEntity { pub fn new() -> ContainerEntity { ContainerEntity { - coden: None, - abbrev: None, wikidata_qid: None, issnl: None, publisher: None, + container_type: None, name: None, edit_extra: None, extra: None, @@ -709,13 +705,18 @@ pub struct ReleaseContrib { #[serde(skip_serializing_if = "Option::is_none")] pub raw_name: Option<String>, - #[serde(rename = "extra")] - #[serde(skip_serializing_if = "Option::is_none")] - pub extra: Option<serde_json::Value>, - #[serde(rename = "role")] #[serde(skip_serializing_if = "Option::is_none")] pub role: Option<String>, + + /// Raw affiliation string as displayed in text + #[serde(rename = "raw_affiliation")] + #[serde(skip_serializing_if = "Option::is_none")] + pub raw_affiliation: Option<String>, + + #[serde(rename = "extra")] + #[serde(skip_serializing_if = "Option::is_none")] + pub extra: Option<serde_json::Value>, } impl ReleaseContrib { @@ -725,8 +726,9 @@ impl ReleaseContrib { creator_id: None, creator: None, raw_name: None, - extra: None, role: None, + raw_affiliation: None, + extra: None, } } } @@ -745,6 +747,11 @@ pub struct ReleaseEntity { #[serde(skip_serializing_if = "Option::is_none")] pub contribs: Option<Vec<models::ReleaseContrib>>, + /// Short version of license name. Eg, 'CC-BY' + #[serde(rename = "license_slug")] + #[serde(skip_serializing_if = "Option::is_none")] + pub license_slug: Option<String>, + /// Two-letter RFC1766/ISO639-1 language code, with extensions #[serde(rename = "language")] #[serde(skip_serializing_if = "Option::is_none")] @@ -766,6 +773,14 @@ pub struct ReleaseEntity { #[serde(skip_serializing_if = "Option::is_none")] pub volume: Option<String>, + #[serde(rename = "jstor_id")] + #[serde(skip_serializing_if = "Option::is_none")] + pub jstor_id: Option<String>, + + #[serde(rename = "arxiv_id")] + #[serde(skip_serializing_if = "Option::is_none")] + pub arxiv_id: Option<String>, + #[serde(rename = "core_id")] #[serde(skip_serializing_if = "Option::is_none")] pub core_id: Option<String>, @@ -834,7 +849,12 @@ pub struct ReleaseEntity { #[serde(skip_serializing_if = "Option::is_none")] pub work_id: Option<String>, - /// Required for valid entities + /// Title in original language (or, the language of the full text of this release) + #[serde(rename = "original_title")] + #[serde(skip_serializing_if = "Option::is_none")] + pub original_title: Option<String>, + + /// Required for valid entities. The title used in citations and for display; usually English #[serde(rename = "title")] #[serde(skip_serializing_if = "Option::is_none")] pub title: Option<String>, @@ -874,11 +894,14 @@ impl ReleaseEntity { abstracts: None, refs: None, contribs: None, + license_slug: None, language: None, publisher: None, pages: None, issue: None, volume: None, + jstor_id: None, + arxiv_id: None, core_id: None, pmcid: None, pmid: None, @@ -895,6 +918,7 @@ impl ReleaseEntity { files: None, container: None, work_id: None, + original_title: None, title: None, state: None, ident: None, |