D-Net
/
dhp-schemas
10
1
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
410 Commits 26 Branches 47 Tags 662 KiB
Commit Graph

169 Commits

Author SHA1 Message Date
Sandro La Bruzzo 88a347d978 implemented unitTest to verify if compare works 2022-02-23 10:42:23 +01:00
Sandro La Bruzzo dc514a7281 implemented comparable on each element of scholix 2022-02-22 17:26:05 +01:00
Sandro La Bruzzo fb05d15ff2 implemented comparable interface on few fields 2022-02-21 10:57:47 +01:00
Alessia Bardi 78929fe658 merge logics changed to consider invisble in dataInfo 2022-02-10 18:57:16 +01:00
Alessia Bardi 05d1a21ebe Merge branch 'master' into APClevelresult 2022-02-04 14:10:45 +01:00
Miriam Baglioni 91af2dade8 [APC at the result level] added other test 2022-02-04 13:18:46 +01:00
Miriam Baglioni 2895988f2b [APC at the result level] added the APC at the level of the result and test for the merge and resource for the tes 2022-02-04 12:52:12 +01:00
Alessia Bardi a8c9f8e666 added URL to OpenAPC test record 2022-02-02 17:28:32 +01:00
Miriam Baglioni 09ef0e9760 [Enrichment Entities] changed name and id of OpenAPC datasource because of mess in DS ids 2022-02-01 16:38:51 +01:00
Claudio Atzori adabfed068 introduced concept of enrichment providers in the identifier creation strategy 2022-01-26 14:59:12 +01:00
Claudio Atzori 19c84675f8 Merge branch 'master' into delegated_authorities 2022-01-21 14:21:53 +01:00
Claudio Atzori 55800920a9 added helper method to get the OpenAIRE ids of the delegated authorities 2022-01-21 14:21:30 +01:00
Sandro La Bruzzo d90704f1bb updated method, using java.lang.Pair instead of scala tuple2 2022-01-14 10:06:49 +01:00
Sandro La Bruzzo 30665c840c update method normalized Pid to reuse existent function on CleaningFunction. 
-renamed the method name
 2022-01-14 09:46:32 +01:00
Sandro La Bruzzo 0996676f5b Implement merge extending enrichment 
implemented test
 2022-01-13 14:50:18 +01:00
Sandro La Bruzzo 7996cfd33d Added Enrichment provenance constant 
added first utility for checking weather is an enrichment entity
 2022-01-12 16:54:12 +01:00
Miriam Baglioni 0a54f5bea7 [Dump-schema] update schemas for some classes for the new json annotation 2021-12-14 18:37:00 +01:00
Miriam Baglioni 34ec7dbf02 [Dump-schema] update Result schema 2021-12-14 18:16:24 +01:00
Miriam Baglioni 984375cb46 [Dump-schema] resolved conflicts 2021-12-14 16:31:31 +01:00
Miriam Baglioni 040bef60d9 Merge pull request 'schema-dump' (#7) from dump_schema into master 
Reviewed-on: #7
 2021-12-14 16:01:54 +01:00
Miriam Baglioni 41841e3347 - 2021-12-06 14:51:29 +01:00
Miriam Baglioni ca03bf1380 Merge branch 'master' of https://code-repo.d4science.org/D-Net/dhp-schemas 2021-12-06 14:49:17 +01:00
Claudio Atzori 8a809a60e2 Added helper method to lookup for inverse relations regardless of the upper/lower case in the relation encoding 2021-12-06 10:45:23 +01:00
Claudio Atzori 0194a86433 Revert to 923c0ff803 2021-12-06 10:03:07 +01:00
Claudio Atzori a69e57eecc Added helper method to lookup for inverse relations regardless of the upper/lower case in the relation encoding 2021-12-06 09:53:15 +01:00
Claudio Atzori 923c0ff803 Merge branch 'master' of https://code-repo.d4science.org/D-Net/dhp-schemas 2021-12-01 09:29:01 +01:00
Claudio Atzori 80f4baa412 fixed relation label separator 2021-12-01 09:28:56 +01:00
Miriam Baglioni 593034920a [Schema-Dump] added class to automatically generate schemas and save them in /eu/dnetlib/dhp/schema/oaf/dump/jsonschemas/ under target/classes (target/test-classes) directory 2021-11-19 15:30:35 +01:00
Miriam Baglioni 11e062f54c [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - part 6 2021-11-19 14:42:12 +01:00
Miriam Baglioni 823b4cc210 [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - part 5 2021-11-18 11:55:43 +01:00
Miriam Baglioni 61400f22c2 [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - part 4 2021-11-18 11:49:16 +01:00
Miriam Baglioni a222c28fec [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - refactoring 2021-11-18 11:24:32 +01:00
Miriam Baglioni 82720345f0 [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - pat 3 2021-11-18 11:23:48 +01:00
Miriam Baglioni fd0f1d5068 [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - refactoring 2021-11-18 11:01:44 +01:00
Miriam Baglioni dabbcf7315 [Graph Dump]revertng master as it was before the insertion of the annotation to automatically add comments in the schema 2021-11-18 10:49:14 +01:00
Miriam Baglioni 9e8abe59f8 [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field - part 2 2021-11-18 10:36:00 +01:00
Miriam Baglioni 5276cc1195 Revert "[Graph Dump] changed the type for policies from Object to String" 
This reverts commit 95592369f2.
 2021-11-18 09:35:11 +01:00
Miriam Baglioni baef47b360 Revert "[Graph Dump] added test class to generate the json schema of the dump" 
This reverts commit fb0139c09a.
 2021-11-18 09:31:40 +01:00
Miriam Baglioni 9c2aadac92 [Schema-Dump] changed the model to allow to change the description annotation w.r.t. the specific semantics of the field 2021-11-18 09:16:59 +01:00
Miriam Baglioni fb0139c09a [Graph Dump] added test class to generate the json schema of the dump 2021-11-17 10:24:04 +01:00
Miriam Baglioni 95592369f2 [Graph Dump] changed the type for policies from Object to String 2021-11-17 09:28:54 +01:00
Miriam Baglioni c6e733b47b [Graph Dump] change in the description of the measures field for #5 (comment) and #5 (comment) 2021-11-16 10:30:06 +01:00
Miriam Baglioni ea5ad71286 [Graph Dump] change in the description of the measures field for #5 (comment) and #5 (comment) 2021-11-16 10:21:52 +01:00
Miriam Baglioni 3fe8e14d5a [Graph Dump] Regenerated schema for the dumped result 2021-11-15 16:53:03 +01:00
Miriam Baglioni 80a2991016 [Graph Dump] Moving the measure at the level of the instance 2021-11-15 16:26:32 +01:00
Claudio Atzori 8b1bcc065d - added Instance.measures field, allowing to maintain the association between them and the individual result instance 
- bumped pom version
- updated changelog
 2021-11-12 15:16:44 +01:00
Miriam Baglioni 3a0bff2ac4 [Graph Dump] added the json schema files 2021-11-12 11:49:31 +01:00
Miriam Baglioni 1eb683ccac changed to the type of bestaccessright in the result 2021-11-10 17:04:26 +01:00
Miriam Baglioni ca4be66c1a Reverted the type of bestaccessright to the version without openaccessroute 2021-11-10 16:58:37 +01:00
Miriam Baglioni d1582e7930 Added implements Serializable to eu.dnetlib.dhp.schema.oaf.Measure class 2021-11-09 15:49:36 +01:00
Claudio Atzori 7b239c94c4 code formatting 2021-10-18 17:27:13 +02:00
Sandro La Bruzzo b0199b2e10 Added missing datacite Relations into dhp-schemas 2021-10-18 17:14:23 +02:00
Claudio Atzori bc7828cdee added new relation labels in the relationInverseMap 2021-10-18 12:07:29 +02:00
Michele Artini f9f64ba93f add parent/child rels 2021-10-13 11:29:32 +02:00
Claudio Atzori 466503ccaa added IsParentOf / IsChildOf relClass constants 2021-10-12 11:50:33 +02:00
Claudio Atzori db21240a3f Merge branch 'master' into dump_extention 2021-10-01 11:05:27 +02:00
Miriam Baglioni 5c2ed26073 added constants for OpenCitations 2021-09-23 16:20:47 +02:00
Claudio Atzori 5ab85f35c2 added constants declaring vocabulary names for relation fields 2021-09-15 16:02:29 +02:00
Claudio Atzori 3bffa796f2 added constants declaring vocabulary names for relation fields 2021-09-14 18:59:13 +02:00
Alessia Bardi 65023a7520 Merge branch 'master' into datasource_model_eosc 2021-08-23 10:45:09 +02:00
Claudio Atzori 1a34a9f7b3 added public constructor to allow subclassing 2021-08-11 15:42:00 +02:00
Claudio Atzori 3ab98d8b37 suggestions from SonarLint 2021-08-10 09:36:37 +02:00
Miriam Baglioni 49d42ea9d8 added new static newInstance method in the Validated class 2021-08-06 14:44:33 +02:00
Miriam Baglioni 32bcdcb1c0 added extention to the schema for the relation validated by funder 2021-08-06 14:31:35 +02:00
Claudio Atzori f075753c3f code formatting 2021-08-05 14:01:18 +02:00
Claudio Atzori 77c5a0c3a5 Merge branch 'master' into datasource_model_eosc 2021-08-05 12:35:35 +02:00
Miriam Baglioni 28ef0d2fa3 extended the schema of the dump to mirror the changes in the model. Added openaccessroute at the level of the instance inside the AccessRight element. Added the information of the pid and the alternate indentifiers at the level of the instance, and added the bipFinder measures at the level of the dumper result. Also correct a typo in the Measure class in the oaf model 2021-08-05 12:04:10 +02:00
Claudio Atzori 2614c2c645 updated casing for the relClass terms: IsAmongTopNSimilarDocuments, HasAmongTopNSimilarDocuments, IsRelatedTo 2021-08-03 17:45:41 +02:00
Claudio Atzori b478ae0a07 added model constants for relClass terms isAmongTopNSimilarDocuments/hasAmongTopNSimilarDocuments 2021-08-03 17:23:49 +02:00
Claudio Atzori b99477e137 fixed regex for DOI cleaning 2021-08-02 13:39:00 +02:00
Claudio Atzori 00693d6f9b Merge branch 'master' into datasource_model_eosc 2021-07-29 17:27:30 +02:00
Claudio Atzori aa0c79e0d1 Merge branch 'master' into delegated_authorities 2021-07-29 17:27:04 +02:00
Miriam Baglioni 5b99f678f4 indented test resource 2021-07-29 15:22:12 +02:00
Claudio Atzori 9d11c973e9 Merge branch 'master' of https://code-repo.d4science.org/D-Net/dhp-schemas 2021-07-28 10:54:27 +02:00
Claudio Atzori e54f8449c7 added constants from the ACCESS_RIGHTS vocab 2021-07-28 10:54:21 +02:00
Michele Artini 97c5fe44d8 Merge branch 'master' into datasource_model_eosc 2021-07-27 13:01:12 +02:00
Miriam Baglioni 36930204c7 revert before renaming originalId to acronym 2021-07-27 12:59:10 +02:00
Michele Artini 08bab501dc updated the definition of the new fields 2021-07-27 11:20:45 +02:00
Michele Artini 937a6550c0 updated schema of dsm_datasources_eosc 2021-07-26 14:09:29 +02:00
Michele Artini 152b16ddfa patcg db for eosc 2021-07-23 12:06:59 +02:00
Claudio Atzori 103b781f3b added support for delegated authorities in the PID filtering criteria, thus in the identifier creation procedure 2021-07-22 16:51:45 +02:00
Michele Artini 5dc27152e2 new fields for eosc 2021-07-22 14:42:08 +02:00
Michele Artini 1bbc98694e add field datasourcetypeui 2021-07-22 12:40:23 +02:00
Miriam Baglioni 4336646df9 changed the name of originalId in acronym 2021-07-13 16:20:05 +02:00
Miriam Baglioni cba43126e1 Added APC to the schema of the dump 2021-07-13 15:01:00 +02:00
Miriam Baglioni 5f0b0d3a87 Merge branch 'master' of https://code-repo.d4science.org/D-Net/dhp-schemas 2021-07-13 13:39:22 +02:00
Sandro La Bruzzo bc66406171 [Scholexplorer]: 
Removed TypedIdentifier class on summary and resue ScholixIdentifier
 2021-07-13 10:10:35 +02:00
Sandro La Bruzzo 905d425064 [Scholexplorer]: 
Updated scholix model: added subtype in scholix Summary and URL in Identifier field
 2021-07-13 10:10:15 +02:00
Sandro La Bruzzo 9b0fc0ec2e [Scholexplorer]: 
Imported Scholix Schema and Scholix Summary data model on dhp-schemas
 2021-07-13 10:09:48 +02:00
Sandro La Bruzzo 78c8781fca [Scholexplorer]: 
Removed TypedIdentifier class on summary and resue ScholixIdentifier
 2021-07-06 09:54:26 +02:00
Sandro La Bruzzo c0d47b2248 Merge branch 'master' of code-repo.d4science.org:D-Net/dhp-schemas 2021-07-05 14:36:55 +02:00
Sandro La Bruzzo 74aa404a80 [Scholexplorer]: 
Updated scholix model: added subtype in scholix Summary and URL in Identifier field
 2021-07-05 14:36:45 +02:00
Claudio Atzori b0203ff5cc added more cleaning/identifier utilities 2021-07-05 14:35:26 +02:00
Claudio Atzori a7472744ec added resultResult relation types, inspired by Datacite 2021-07-05 11:12:44 +02:00
Claudio Atzori fc913472a1 code formatting 2021-07-05 11:11:45 +02:00
Sandro La Bruzzo 7605f08d81 [Scholexplorer]: 
Imported Scholix Schema and Scholix Summary data model on dhp-schemas
 2021-07-01 14:29:47 +02:00
Miriam Baglioni 92750c418c Merge branch 'master' of https://code-repo.d4science.org/D-Net/dhp-schemas 2021-06-21 09:58:05 +02:00
Claudio Atzori f5a3b451c9 Result.mergeFrom handles dateOfAcceptance 2021-06-18 09:58:30 +02:00
Claudio Atzori f0e00d3abd WIP descriptions for pid types 2021-06-18 09:57:57 +02:00
Claudio Atzori 4328c3ca19 delegating the date parsing to https://github.com/sisyphsu/dateparser 2021-06-09 12:29:24 +02:00