Claudio Atzori
fbad4988be
relClass values should be camel-case
2020-10-30 17:26:17 +01:00
Claudio Atzori
c5dda3a00c
Merge pull request 'h2020classification' ( #49 ) from miriam.baglioni/dnet-hadoop:h2020classification into master
...
LGTM
2020-10-30 17:10:05 +01:00
Miriam Baglioni
4905739be6
changed resource file to mirror change in business logic
2020-10-30 17:02:57 +01:00
Miriam Baglioni
b40360ebfb
changed the code to mirror the changed decision in the classification level and prodramme description labels
2020-10-30 17:02:30 +01:00
Miriam Baglioni
696409fb9f
disabled tests because needing remote resource
2020-10-30 17:01:48 +01:00
Sandro La Bruzzo
1d9fdb7367
fixed spark memory issue in SparkSplitOafTODLIEntities
2020-10-28 12:30:32 +01:00
sandro
3a81a940b7
solved bug on merge publication
2020-10-21 22:41:55 +02:00
Miriam Baglioni
a2ce527fae
changed to match the requirements for short titles in level and long titles in classification
2020-10-20 17:03:25 +02:00
Sandro La Bruzzo
346ed65e2c
added upload to zenodo node
2020-10-20 16:59:55 +02:00
sandro
271b4db450
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
2020-10-20 16:09:49 +02:00
sandro
d58d02d448
added workflow upload on zenodo
2020-10-20 16:09:07 +02:00
Alessia Bardi
1425d810a8
testing mapping
2020-10-19 17:46:14 +02:00
Sandro La Bruzzo
fed711da80
Merge remote-tracking branch 'origin/master' into merge_record_to_common
2020-10-13 15:32:45 +02:00
Sandro La Bruzzo
34bf64c94f
fixed export Scholexplorer to OpenAire
2020-10-13 08:47:58 +02:00
Alessia Bardi
8775a64bc1
Merge pull request 'Merging different compatibility levels (pinocchio operator)' ( #47 ) from merge_graph into master
2020-10-09 14:44:52 +02:00
Claudio Atzori
e751c1402f
Merge branch 'master' of https://code-repo.d4science.org/D-Net/dnet-hadoop
2020-10-09 13:53:21 +02:00
Claudio Atzori
b961dc7d1e
added originalid to the fields in the result graph view
2020-10-09 13:53:15 +02:00
Sandro La Bruzzo
734934e2eb
fixed error on empty intersection with publication and relation on export to OAF
2020-10-08 17:29:29 +02:00
Sandro La Bruzzo
eec418cd26
moved AuthoreMerger into dhp-common
2020-10-08 10:33:55 +02:00
Sandro La Bruzzo
fe0a7870e6
Added test to check if merge authors works
2020-10-08 10:33:12 +02:00
Sandro La Bruzzo
cd9c377d18
adpted scholexplorer Dump generation to the new Dataset definition
2020-10-08 10:10:13 +02:00
Claudio Atzori
a3f37a9414
javadoc
2020-10-07 16:44:22 +02:00
Claudio Atzori
8d85a2fced
[BETA wf only] datasources involved in the merge operation doesn't obey to the infra precedence policy, but relies on a custom behaviour that, given two datasources from beta and prod returns the one from prod with the highest compatibility among the two
2020-10-07 16:28:52 +02:00
Claudio Atzori
5f7b75f5c5
code formatting
2020-10-07 13:22:54 +02:00
miconis
5a8bc329c5
bug fix in the result merge: it takes the correct bestaccessright basing on the license instead of the trust
2020-10-06 15:26:44 +02:00
Claudio Atzori
babebbc9d3
Merge pull request 'Adding H2020 Classification, topic code and topic description to H2020 projects' ( #46 ) from miriam.baglioni/dnet-hadoop:h2020classification into master
...
LGTM, thanks Miriam.
2020-10-05 14:14:38 +02:00
Miriam Baglioni
d8839d1858
adding short description
2020-10-05 14:09:59 +02:00
Miriam Baglioni
061527f06e
adding short description
2020-10-05 13:54:39 +02:00
Miriam Baglioni
0c12d7bdd8
adding short description
2020-10-05 11:39:55 +02:00
Miriam Baglioni
ae08b3c0dd
merge branch with master
2020-10-05 11:35:55 +02:00
Claudio Atzori
23f64d9eb4
updated dedup tests following the dnet-pace-core library update
2020-10-02 14:30:53 +02:00
Claudio Atzori
4fddd18403
updating to dnet-pace-core:4.0.5
...
- fixed error in the treeprocessor. it used th=-1 as default value, now it use th=1 5021e5048f
- fixed error in the block processor: entities with orderField=null were not considered 9e8ea8f6ee
2020-10-02 12:37:25 +02:00
Miriam Baglioni
fc2f7636be
removed not used code
2020-10-02 12:33:52 +02:00
Miriam Baglioni
12407c1f32
modification related to D-Net/dnet-hadoop#46 (comment) and also modified teh java doc with correct ref to H2020CLassification instead of H2020Programme
2020-10-02 12:29:01 +02:00
Miriam Baglioni
1cda6fd1ba
modification related to D-Net/dnet-hadoop#46 (comment)
2020-10-02 12:27:48 +02:00
Claudio Atzori
9db0f88fb8
Merge branch 'master' of https://code-repo.d4science.org/D-Net/dnet-hadoop
2020-10-02 09:43:35 +02:00
Claudio Atzori
49ae3450a9
code formatting
2020-10-02 09:43:24 +02:00
Claudio Atzori
1c44182dea
minor changes
2020-10-02 09:41:34 +02:00
Claudio Atzori
c2a6e2a9bf
fixed mapping for datasource journal info (ISSNs)
2020-10-02 09:37:08 +02:00
Miriam Baglioni
c6e6ed1bd8
merge branch with master
2020-10-01 16:24:41 +02:00
Miriam Baglioni
4aec347351
refactoring
2020-10-01 16:23:52 +02:00
Miriam Baglioni
61946b4092
refactoring
2020-10-01 16:22:48 +02:00
Miriam Baglioni
7e6d35e56c
added the link to the excel file related to topic
2020-10-01 15:53:31 +02:00
Sandro La Bruzzo
1a0a44e85a
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
2020-10-01 15:46:53 +02:00
Sandro La Bruzzo
c4a3c52e45
fixed Doiboost bug in the identifier
2020-10-01 15:46:44 +02:00
Miriam Baglioni
43cbd62c2b
added classpath.first in the configuration
2020-10-01 15:46:34 +02:00
Miriam Baglioni
cd69c6b023
added dependency for the topic file path
2020-10-01 15:45:59 +02:00
Miriam Baglioni
5ef03e5971
added the dependencies from dhp-aggregation for h2020classification
2020-10-01 15:44:40 +02:00
Miriam Baglioni
771cde3d05
moved the library version to global pom
2020-10-01 15:43:47 +02:00
Miriam Baglioni
632351c0da
modified test resources to mirror the changed in the code
2020-10-01 15:43:02 +02:00