 Miriam Baglioni
|
65bf312360
|
merge branch with fork master
|
2020-06-18 11:35:27 +02:00 |
|
Miriam Baglioni
|
8211cbb9fe
|
extension of Result to contain all the properties owned by any result type
|
2020-06-18 11:23:52 +02:00 |
|
Miriam Baglioni
|
bc8611a95a
|
added new resources for testing
|
2020-06-18 11:19:20 +02:00 |
 Sandro La Bruzzo
|
9bf67f5de1
|
resolved conflicts
|
2020-06-17 09:15:43 +02:00 |
|
Sandro La Bruzzo
|
1d4275acc4
|
implemented first version of exportation of Scholexplorer into ActionSet
|
2020-06-17 09:10:38 +02:00 |
miconis
|
5233b15265
|
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
|
2020-06-16 18:31:19 +02:00 |
|
miconis
|
11b77b9f4e
|
json dumps for entity merge test modified to fit the new model. title merge adjusted to fix the error
|
2020-06-16 18:31:11 +02:00 |
 Claudio Atzori
|
306669209f
|
code formatting
|
2020-06-16 16:54:44 +02:00 |
|
Claudio Atzori
|
603b1bd0bb
|
Merge branch 'master' into dhp_oaf_model
|
2020-06-16 15:43:59 +02:00 |
|
Miriam Baglioni
|
9dd3ef22c5
|
merge branch with fork master
|
2020-06-15 11:23:26 +02:00 |
|
Miriam Baglioni
|
56e70573c2
|
-
|
2020-06-15 11:06:56 +02:00 |
|
Miriam Baglioni
|
20b9e67728
|
added new class funder
|
2020-06-15 11:06:18 +02:00 |
|
Claudio Atzori
|
c4d9f1837f
|
[maven-release-plugin] prepare for next development iteration
|
2020-06-12 12:21:08 +02:00 |
|
Claudio Atzori
|
f0746a7605
|
[maven-release-plugin] prepare release dhp-1.2.2
|
2020-06-12 12:21:03 +02:00 |
|
Claudio Atzori
|
463489f59f
|
code formatting
|
2020-06-12 12:03:25 +02:00 |
|
Claudio Atzori
|
4bcad1c9c3
|
Merge branch 'graph_cleaning'
|
2020-06-12 11:40:25 +02:00 |
 Alessia Bardi
|
ed8879ed8b
|
deprecate PUBLICATION_DATASET
|
2020-06-12 10:55:56 +02:00 |
|
Alessia Bardi
|
3ade2631b3
|
Constants for new rels: citations and reviews
|
2020-06-12 10:52:12 +02:00 |
|
Claudio Atzori
|
ba8a024af9
|
avoid NPEs merging titles
|
2020-06-12 10:45:11 +02:00 |
|
Claudio Atzori
|
a2fdf85ba1
|
WIP: graph cleaner implementation
|
2020-06-09 19:52:53 +02:00 |
|
Miriam Baglioni
|
206abba48c
|
merge branch with fork master
|
2020-06-09 15:41:14 +02:00 |
|
Miriam Baglioni
|
5121cbaf6a
|
new classes for external dump. Only classes functional to dump products
|
2020-06-09 15:37:46 +02:00 |
|
Miriam Baglioni
|
f232db84e9
|
new classes for external dump. Only classes functional to dump products
|
2020-06-08 15:11:37 +02:00 |
|
Claudio Atzori
|
25a093b1a4
|
integrated changes from master
|
2020-06-08 15:04:00 +02:00 |
|
Claudio Atzori
|
45973b5743
|
Merge branch 'master' of https://code-repo.d4science.org/D-Net/dnet-hadoop
|
2020-06-08 15:01:34 +02:00 |
|
Claudio Atzori
|
94533b71bc
|
added comments for model fields removal
|
2020-06-08 15:01:21 +02:00 |
|
Claudio Atzori
|
b2f9564f13
|
WIP: fixed PrepareRelationsJob; parallel implementation of CreateRelatedEntitiesJob_phase2, now works by OafType; introduced custom aggregator in AdjacencyListBuilderJob
|
2020-05-29 10:58:15 +02:00 |
|
Sandro La Bruzzo
|
b87b3ddb6b
|
changed mapping ORCIDToOAF
|
2020-05-29 09:32:04 +02:00 |
|
Sandro La Bruzzo
|
7d29b61c62
|
code refactor
|
2020-05-28 09:57:46 +02:00 |
|
Miriam Baglioni
|
dd1e0b93b8
|
added merge for Programme
|
2020-05-27 17:40:32 +02:00 |
|
Miriam Baglioni
|
f3dcca0dd0
|
added equals for programme
|
2020-05-27 17:23:34 +02:00 |
|
Miriam Baglioni
|
92e3a52e91
|
merge branch with fork master
|
2020-05-26 15:57:51 +02:00 |
|
Claudio Atzori
|
7b288a94cb
|
code formatting
|
2020-05-26 09:54:13 +02:00 |
|
Claudio Atzori
|
7582532e73
|
[maven-release-plugin] prepare for next development iteration
|
2020-05-25 19:48:18 +02:00 |
|
Claudio Atzori
|
01c2e93395
|
[maven-release-plugin] prepare release dhp-1.2.1
|
2020-05-25 19:48:14 +02:00 |
|
Claudio Atzori
|
ae04234472
|
DataInfo.deletedbyinference is false by default
|
2020-05-25 19:32:48 +02:00 |
|
miconis
|
da1e5cf557
|
implementation of the result title merge. main title with higher trust, distinct between the others
|
2020-05-25 18:02:57 +02:00 |
|
Claudio Atzori
|
4b34872b44
|
using Objects.equals to check Field<T> equivalence
|
2020-05-25 10:14:15 +02:00 |
|
Claudio Atzori
|
0ab0206b4d
|
removed null objects from flattened Field<T> in mergeLists
|
2020-05-25 10:11:41 +02:00 |
|
Claudio Atzori
|
de108f54d6
|
code formatting
|
2020-05-23 10:21:19 +02:00 |
|
Claudio Atzori
|
6b56cae57d
|
added mapping for bestaccessrights
|
2020-05-23 09:57:39 +02:00 |
|
Miriam Baglioni
|
24daa1deaa
|
added to the Project class a new field that is the list of programmes
|
2020-05-20 10:28:16 +02:00 |
|
Miriam Baglioni
|
d323100af0
|
added the new Programme POJO. It contains the code and the description of the programme
|
2020-05-20 10:27:27 +02:00 |
|
Miriam Baglioni
|
22cb9e0da7
|
simple code to get file from URL
|
2020-05-15 18:18:01 +02:00 |
|
Miriam Baglioni
|
3aaad753fd
|
Merge branch 'master' into dhp_oaf_model
|
2020-05-15 15:55:23 +02:00 |
|
Claudio Atzori
|
b7e198475a
|
added common methods to create HiveDB table identifiers
|
2020-05-15 10:20:07 +02:00 |
|
Miriam Baglioni
|
42085e8d99
|
added some constants
|
2020-05-14 18:22:28 +02:00 |
|
Claudio Atzori
|
c6b028f2af
|
code formatting
|
2020-05-11 17:38:08 +02:00 |
|
Claudio Atzori
|
637653cba3
|
integrated changes from master
|
2020-05-11 14:05:25 +02:00 |
|
Miriam Baglioni
|
2abb84877d
|
Merge branch 'master' into blacklist
|
2020-05-11 10:37:49 +02:00 |