Miriam Baglioni
87018ac895
merge with master
2021-07-13 12:17:37 +02:00
Miriam Baglioni
c2ef9e3856
merge upstream
2021-06-22 14:35:55 +02:00
Miriam Baglioni
59c36eb185
check if pid is null (to avoid NullPointerException)
2021-06-21 10:41:47 +02:00
Miriam Baglioni
2d5f9e8e1c
Merge branch 'master' of code-repo.d4science.org:miriam.baglioni/dnet-hadoop
2021-06-21 10:02:33 +02:00
Miriam Baglioni
066e1dc772
added new dependency ag common-text
2021-06-21 09:26:40 +02:00
Miriam Baglioni
00dfaff973
refactoring and changed query that was wrong
2021-06-21 09:23:55 +02:00
Miriam Baglioni
464ac6301c
added the reader for the dump of crossref
2021-06-21 09:22:29 +02:00
Miriam Baglioni
c07f820c21
-
2021-06-21 09:16:31 +02:00
Miriam Baglioni
2740b95f99
-
2021-06-21 09:16:05 +02:00
Miriam Baglioni
ca7e10b3c0
-
2021-06-21 09:15:43 +02:00
Miriam Baglioni
2f6673e678
-
2021-06-21 09:14:32 +02:00
Claudio Atzori
6b8c357381
removed extra whitespace at the end of the file
2021-06-18 16:08:45 +02:00
Claudio Atzori
c0d2b62e46
[doiboost] added missing implicit Encoder
2021-06-18 15:57:41 +02:00
Claudio Atzori
a3948c1f6e
cleanup old doiboost workflows
2021-06-18 15:14:08 +02:00
Claudio Atzori
fddbc8364e
Merge branch 'alessia.bardi-datepicker'
2021-06-17 09:24:46 +02:00
Alessia Bardi
6208b04f1d
smarter DatePicker for ISO dates on dateofacceptance
2021-06-16 14:56:26 +02:00
Sandro La Bruzzo
9ca438d9b1
imported from branch stable_ids generation of Actionset datacite
2021-06-10 14:59:45 +02:00
Sandro La Bruzzo
42ff7a5665
some fix to the pom to compile scala
2021-06-10 14:31:06 +02:00
Sandro La Bruzzo
ebe6aa6d38
implemented datacite transformation also on master
2021-06-10 10:52:36 +02:00
Miriam Baglioni
32b0c27217
Aggiornare 'dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/PrepareResultInstRepoAssociation.java'
...
fix in SQL query: while writing the blacklist constraint it used d.id to indicate the datasource id, but no alias for the datasource was defined. So I removed the alias
2021-06-09 18:36:11 +02:00
Miriam Baglioni
0eda93b3eb
-
2021-06-09 13:25:35 +02:00
Miriam Baglioni
72771a1254
-
2021-06-09 13:25:19 +02:00
Miriam Baglioni
6cdc4d3bf3
-
2021-05-31 11:07:24 +02:00
Miriam Baglioni
a106353cee
-
2021-05-31 11:00:30 +02:00
Miriam Baglioni
5d8257b288
added code for ircdl_extention
2021-05-31 10:59:58 +02:00
Claudio Atzori
a4cfabdbc6
Merge pull request 'master' ( #111 ) from antonis.lempesis/dnet-hadoop:master into master
...
Reviewed-on: D-Net/dnet-hadoop#111
2021-05-28 14:09:12 +02:00
Claudio Atzori
338327171d
integrating pull #109 , H2020Classification
2021-05-27 11:57:01 +02:00
Claudio Atzori
6cbda49112
more pervasive use of constants from ModelConstants, especially for ORCID
2021-05-26 18:13:04 +02:00
Miriam Baglioni
abd88f663d
changed test resource to mirror change in the input file
2021-05-21 15:20:47 +02:00
Miriam Baglioni
c844877de2
changed workflow flow to possibly parallelize also the programme and project preparation steps
2021-05-21 14:41:57 +02:00
Miriam Baglioni
073d76864d
refactoring
2021-05-21 14:41:03 +02:00
Miriam Baglioni
4c8b4a774c
removed not needed code
2021-05-21 14:40:07 +02:00
Miriam Baglioni
53b9d87fec
new prepareProgramme according to the new file
2021-05-21 11:49:31 +02:00
Miriam Baglioni
1ee8f13580
refactoring and added "left" as join type to be 100% sure to get the whole set of projects
2021-05-21 11:49:05 +02:00
Miriam Baglioni
e07c3ba089
due to change in the input file the filtering step is no more needed
2021-05-21 11:47:43 +02:00
Miriam Baglioni
54f6e2f693
changed to get the needed information to build the action set as parallel jobs
2021-05-21 11:47:00 +02:00
Miriam Baglioni
7180505519
removed non needed variable
2021-05-21 11:46:13 +02:00
Miriam Baglioni
2eb1a8b344
changed because the input file changed
2021-05-21 11:40:20 +02:00
Miriam Baglioni
9610224671
added param to workflow property
2021-05-20 18:21:12 +02:00
Miriam Baglioni
aa45b4df9b
-
2021-05-20 15:57:40 +02:00
Miriam Baglioni
052c837843
-
2021-05-20 15:54:44 +02:00
Claudio Atzori
ea9b00ce56
adjusted test
2021-05-20 15:31:42 +02:00
Claudio Atzori
2e70aa43f0
Merge pull request 'H2020Classification fix and possibility to add datasources in blacklist for propagation of result to organization' ( #108 ) from miriam.baglioni/dnet-hadoop:master into master
...
Reviewed-on: D-Net/dnet-hadoop#108
The changes look ok, but please drop a comment to describe how the parameters should be changed from the workflow caller for both workflows
* H2020Classification
* propagation of result to organization
2021-05-20 15:25:05 +02:00
Claudio Atzori
b572f56763
Merge branch 'master' into master
2021-05-20 15:22:35 +02:00
Claudio Atzori
2578b7fbb3
code formatting
2021-05-20 14:59:02 +02:00
Miriam Baglioni
dc0ad8d2e0
fixed issue related to change in the file name downloaded. Added sheet name as parameter and also a check if the name should change
2021-05-20 14:53:53 +02:00
Claudio Atzori
aef2977ad0
fixes #6701 : xpath for titles to support both datacite and Guidelines v4 mapping
2021-05-20 14:40:22 +02:00
Miriam Baglioni
02b80cf24f
resolved conflicts
2021-05-20 10:59:39 +02:00
Claudio Atzori
239d0f0a9a
ROR actionset import workflow backported from branch stable_ids
2021-05-18 16:12:11 +02:00
Antonis Lempesis
168edcbde3
added the final steps for the observatory promote wf and some cleanup
2021-05-18 15:23:20 +03:00