1970 Commits

All Branches

Search

Author	SHA1	Message	Date
Claudio Atzori	4287164aba	include relevantdate field in the result view	2020-10-01 10:28:55 +02:00
Miriam Baglioni	7e73bb88b3	changed the logic to add the topic description to the project	2020-09-28 17:21:43 +02:00
Miriam Baglioni	0a035e3630	-	2020-09-28 17:20:49 +02:00
Miriam Baglioni	16bee2084d	added the topic code to the project subset	2020-09-28 17:20:11 +02:00
Miriam Baglioni	0bf2d0db52	added to the workflow the download of the topic excel file and one property needed to get the input path of the topic file in the hdfs filesystem	2020-09-28 12:17:22 +02:00
Miriam Baglioni	c2abde4d9f	changed the implementation of Atomic Actions creation by exploiting the topic information get from the cordis excel file	2020-09-28 12:16:34 +02:00
Miriam Baglioni	d930b8d3fc	changed the query to get only the code of the project and not the optional1 (topic code) and optional2 (topic description)	2020-09-28 12:15:48 +02:00
Miriam Baglioni	f8f5cfd5cc	removed the part added to set the topic code and description in the step of project preparation	2020-09-28 12:13:33 +02:00
Miriam Baglioni	9e19c9a221	remove the topic description from the values in the CSVProject class	2020-09-28 12:11:03 +02:00
Miriam Baglioni	6d8b932e40	refactoring	2020-09-28 12:06:56 +02:00
Miriam Baglioni	b77f166549	changed the package name from csvutils to utils	2020-09-28 12:05:47 +02:00
Miriam Baglioni	e33e3277de	added needed dependency to read the excel file	2020-09-28 12:03:14 +02:00
Miriam Baglioni	f4739a371a	code to get the information related to the topic association between code and description.	2020-09-28 12:02:48 +02:00
Miriam Baglioni	7b6a7333e6	merge branch with master	2020-09-25 16:42:07 +02:00
Miriam Baglioni	983a12ed15	temporary modification to allow the upload of files in the sandbox without the neew to recreate the mapping from scratch	2020-09-25 16:41:51 +02:00
Miriam Baglioni	8b36d19182	added property depositionId and chenage property newVersion that became string from boolean to handle the three possible distinct values	2020-09-25 16:41:15 +02:00
Miriam Baglioni	ed5239f9ec	added new code to handle the new possibility to upload files to an already open deposition	2020-09-25 16:34:32 +02:00
Miriam Baglioni	3a8c524fce	refactor	2020-09-25 16:34:02 +02:00
Miriam Baglioni	ccd48dd78a	added new test for new method	2020-09-25 16:33:43 +02:00
Miriam Baglioni	3e5497b336	added new method to handle an open deposition to which upload data	2020-09-25 16:33:15 +02:00
Miriam Baglioni	2ac2b537b6	merge branch with master	2020-09-25 14:40:47 +02:00
Miriam Baglioni	54800fb9b0	enabled only the step to upload in zenodo	2020-09-25 14:40:22 +02:00
Miriam Baglioni	12c2dfc268	modified the resource to consider the information added to the model	2020-09-25 14:17:23 +02:00
Miriam Baglioni	969fa8d96e	fixed issue and changed the transformation of the programme file to consider the new model	2020-09-25 13:32:34 +02:00
Michele Artini	c171fdebe1	Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop	2020-09-25 09:03:09 +02:00
Michele Artini	c96598aaa4	opendoar partition	2020-09-25 09:02:58 +02:00
Miriam Baglioni	de6c4d46d8	fixed conflicts	2020-09-24 15:35:01 +02:00
Miriam Baglioni	e917281822	-	2020-09-24 15:24:05 +02:00
Miriam Baglioni	9f54f69e6d	added topic information	2020-09-24 15:23:35 +02:00
Miriam Baglioni	d6206d6e63	add the topic description to the action set associated to the project	2020-09-24 15:22:40 +02:00
Miriam Baglioni	6b50226f3b	added topic code and topic description	2020-09-24 15:21:49 +02:00
Miriam Baglioni	15af1f527e	modified to consider the topic information	2020-09-24 15:20:56 +02:00
Miriam Baglioni	609ff17cfc	now the commission give us the framework programme (FP7 - H2020) so use this information to filter out programmes not associated to H2020	2020-09-24 15:19:31 +02:00
Miriam Baglioni	b66f930466	Added optionl1 and optional2 information to the files red from the db. Optional1 contains the topic code and optional2 contains the topic description	2020-09-24 15:16:56 +02:00
Miriam Baglioni	860e6d38a6	added topic description to the CSV project variables	2020-09-24 15:15:26 +02:00
Miriam Baglioni	89612d639c	added the h2020topicdescription	2020-09-24 15:14:50 +02:00
Claudio Atzori	044d3a0214	fixed query used to load datasources in the Graph	2020-09-24 13:48:58 +02:00
Claudio Atzori	27df1cea6d	code formatting	2020-09-24 12:16:00 +02:00
Claudio Atzori	fb22f4d70b	included values for projects fundedamount and totalcost fields in the mapping tests. Swapped expected and actual values in junit test assertions	2020-09-24 12:10:59 +02:00
Claudio Atzori	42f55395c8	fixed order of the ISSNs returned by the SQL query	2020-09-24 12:09:58 +02:00
Claudio Atzori	fadf5c7c69	Merge branch 'master' of https://code-repo.d4science.org/D-Net/dnet-hadoop	2020-09-24 10:42:52 +02:00
Claudio Atzori	9a7e72d528	using concat_ws to join textual columns from PSQL. When using || to perform the concatenation, Null columns makes the operation result to be Null	2020-09-24 10:42:47 +02:00
Claudio Atzori	9e3e93c6b6	setting the correct issn type in the datasource.journal element	2020-09-24 10:39:16 +02:00
Miriam Baglioni	0d83f47166	merge branch with master	2020-09-23 17:33:49 +02:00
Miriam Baglioni	39eb8ab25b	changed the dump to move from h2020programme to h2020classification	2020-09-23 17:33:00 +02:00
Miriam Baglioni	1d84cf19a6	added new line to resource file	2020-09-23 17:32:22 +02:00
Miriam Baglioni	f0c476b6c9	modification to the test classes to consider h2020classification	2020-09-23 17:31:49 +02:00
Miriam Baglioni	2cba3cb484	modification to the classes building the actionset to consider the h2020classification	2020-09-23 17:31:15 +02:00
Miriam Baglioni	3c7ef5ca04	modification to the schema for h2020classification and h2020topic code	2020-09-23 17:30:21 +02:00
Miriam Baglioni	9d8cb5f827	H2020classification renamed as H2020Classification. Moved a method from model definition that was associated to mapping issue, and change the char to split the levels from $ to |	2020-09-22 14:58:53 +02:00