 Claudio Atzori
|
5e5e32cb48
|
Merge branch 'master' of https://code-repo.d4science.org/D-Net/dnet-hadoop
|
2020-02-19 16:56:52 +01:00 |
|
Claudio Atzori
|
33185fd0b7
|
ISLookupClientFactory moved in dhp-common
|
2020-02-19 16:56:38 +01:00 |
 Michele Artini
|
5d3739b5cf
|
migration of claims
|
2020-02-19 15:11:17 +01:00 |
 Miriam Baglioni
|
ab84163bb3
|
added set accumulator in TypedRow and used it to acucmulate country information in Country Propagation
|
2020-02-19 15:02:50 +01:00 |
|
Miriam Baglioni
|
bb0fdf5e0a
|
fix wrong source target in new relation
|
2020-02-19 15:00:46 +01:00 |
|
Miriam Baglioni
|
9e1678ccf8
|
fix error in workflow name
|
2020-02-19 14:59:24 +01:00 |
|
Miriam Baglioni
|
8aa3b4d7c0
|
adding to propagation constants the ones needed for propagation of project to result and addition of new accumulator Set in typed row to collect values of a type
|
2020-02-19 14:55:54 +01:00 |
|
Miriam Baglioni
|
7167673a58
|
implementation and configuration for propagation of project to result through semantic relation: P -> R1 and R1 -> supplemented by -> R2 => P -> R2
|
2020-02-19 14:54:18 +01:00 |
|
Michele Artini
|
173f1df1e5
|
saved a query for openaire production database
|
2020-02-19 10:15:08 +01:00 |
 Sandro La Bruzzo
|
9a2d74ac82
|
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
|
2020-02-19 10:13:45 +01:00 |
|
Sandro La Bruzzo
|
e5d7cdf422
|
fixed sql query
|
2020-02-19 10:13:36 +01:00 |
|
Sandro La Bruzzo
|
2b8675462f
|
refactoring code
|
2020-02-19 10:07:08 +01:00 |
|
Miriam Baglioni
|
b81e6af429
|
added config for new propagation
|
2020-02-18 17:30:44 +01:00 |
|
Miriam Baglioni
|
b736a9581c
|
changed relclass and reltype in reelation specification for country propagation and implementation of propagation of result affiliation through institutional repositories
|
2020-02-18 17:27:28 +01:00 |
|
Miriam Baglioni
|
ed262293a6
|
aligned to new snapshot version 1.1.6
|
2020-02-18 17:25:32 +01:00 |
|
Miriam Baglioni
|
2688a89c21
|
changed relclass and reltype in relation specification
|
2020-02-18 17:24:40 +01:00 |
|
Miriam Baglioni
|
c0022fec9f
|
moved on upper package to serve other propagations
|
2020-02-18 17:24:11 +01:00 |
|
Miriam Baglioni
|
e0a777028a
|
fix problem in parameters
|
2020-02-18 17:23:34 +01:00 |
|
Claudio Atzori
|
ed76521d9b
|
removed stale test resources, will be re-added later on
|
2020-02-18 11:51:08 +01:00 |
|
Claudio Atzori
|
0f364605ff
|
removed stale tests, need to reimplemente them anyway
|
2020-02-18 11:48:19 +01:00 |
|
Miriam Baglioni
|
5868ff8a86
|
synch fork with master
|
2020-02-17 18:22:27 +01:00 |
 Przemysław Jacewicz
|
958f0693d6
|
WIP: logic for promoting action sets added
|
2020-02-17 18:19:19 +01:00 |
|
Miriam Baglioni
|
18e4092d5c
|
change name of properties dir
|
2020-02-17 18:07:06 +01:00 |
|
Miriam Baglioni
|
bd0e504b42
|
changes to the wf configuration
|
2020-02-17 18:04:15 +01:00 |
|
Miriam Baglioni
|
3a9d723655
|
adding default parameters in code
|
2020-02-17 16:30:52 +01:00 |
|
Przemysław Jacewicz
|
bea1a94346
|
Merge branch 'master' into przemyslawjacewicz_actionmanager_impl_prototype
# Conflicts:
# dhp-workflows/pom.xml
|
2020-02-17 15:07:23 +01:00 |
|
Claudio Atzori
|
6a288625e5
|
fixed workflow outgoing node
|
2020-02-17 15:04:33 +01:00 |
|
Miriam Baglioni
|
a5517eee35
|
adding the mkdirs for creation of propagation folder under provision on tmp
|
2020-02-17 14:20:42 +01:00 |
|
Miriam Baglioni
|
9abde5cfac
|
removed outputPath from job parameters
|
2020-02-17 14:19:53 +01:00 |
|
Claudio Atzori
|
1b18fd4d54
|
sync with master branch
|
2020-02-17 13:49:46 +01:00 |
|
Sandro La Bruzzo
|
4f04759738
|
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
|
2020-02-17 12:31:58 +01:00 |
|
Sandro La Bruzzo
|
76ee85141a
|
added oozie job for DNET migration and implemented Spark job for extracting entities
|
2020-02-17 12:31:44 +01:00 |
|
Miriam Baglioni
|
be2421d5d8
|
removed wrongly pushed file
|
2020-02-17 12:07:26 +01:00 |
|
Claudio Atzori
|
c460e2d281
|
Aggiornare 'dhp-workflows/docs/oozie-installer.markdown'
|
2020-02-17 11:54:48 +01:00 |
|
Miriam Baglioni
|
c7bc73aedf
|
country propagation for results collected from institutional repositories
|
2020-02-17 11:44:48 +01:00 |
|
Michele Artini
|
176c5606bd
|
aligned with origin/master, aligned model and mapping
|
2020-02-17 10:40:53 +01:00 |
|
Claudio Atzori
|
56d1810a66
|
working procedure for records indexing using Spark, via lib com.lucidworks.spark:spark-solr
|
2020-02-14 12:28:52 +01:00 |
|
Claudio Atzori
|
1ee1baa8c0
|
Merge branch 'master' into provision_indexing
|
2020-02-13 18:17:07 +01:00 |
|
Claudio Atzori
|
a3d0b57b25
|
[maven-release-plugin] prepare for next development iteration
|
2020-02-13 18:11:33 +01:00 |
|
Claudio Atzori
|
6ed9a15bc8
|
[maven-release-plugin] prepare release dhp-1.1.5
|
2020-02-13 18:11:31 +01:00 |
|
Claudio Atzori
|
49e648f7c3
|
bumped version
|
2020-02-13 18:09:31 +01:00 |
|
Claudio Atzori
|
f9fae97e09
|
test json files aligned with the latest model changes
|
2020-02-13 18:05:59 +01:00 |
|
Claudio Atzori
|
1fee6e2b7e
|
implemented XML records construction and serialization, indexing WIP
|
2020-02-13 16:53:27 +01:00 |
|
Michele Artini
|
80cb52593f
|
bug fixing
|
2020-02-13 15:34:13 +01:00 |
|
Michele Artini
|
cdea0dae75
|
bug fixing
|
2020-02-12 16:34:00 +01:00 |
|
Michele Artini
|
69336195d3
|
simplifications
|
2020-02-12 11:12:38 +01:00 |
|
Michele Artini
|
06c2fd6df9
|
bug fixing
|
2020-02-11 15:29:50 +01:00 |
|
Michele Artini
|
5fc09b179c
|
bug fixing
|
2020-02-11 12:48:03 +01:00 |
|
Michele Artini
|
95740767e0
|
Ready for tests
|
2020-02-10 16:04:06 +01:00 |
|
Michele Artini
|
181e8498d4
|
...
|
2020-02-07 16:02:49 +01:00 |
|
Przemysław Jacewicz
|
86b60268bb
|
actionmanager implementation prototyping
|
2020-02-06 19:14:41 +01:00 |
|
Michele Artini
|
bb1533a07e
|
partial commit
|
2020-02-05 15:35:40 +01:00 |
|
Michele Artini
|
fbb0fc140b
|
partial implementation of migration
|
2020-02-04 15:25:47 +01:00 |
|
Claudio Atzori
|
7ba0f44d05
|
WIP
|
2020-01-30 18:21:07 +01:00 |
|
Claudio Atzori
|
49ef2f4eb1
|
removed input parameter specification, SparkXmlRecordBuilderJob doesn't need hive
|
2020-01-30 18:20:26 +01:00 |
|
Claudio Atzori
|
b5e1e2e5b2
|
reintegrated changes from fcbc4ccd70
|
2020-01-30 18:11:04 +01:00 |
|
Claudio Atzori
|
7bacd6812e
|
Merge branch 'provision_indexing' of https://code-repo.d4science.org/D-Net/dnet-hadoop into HEAD
Conflicts:
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/graph/GraphJoiner.java
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/graph/MappingUtils.java
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/graph/RelatedEntity.java
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/graph/SparkXmlRecordBuilderJob.java
|
2020-01-30 17:59:46 +01:00 |
|
Claudio Atzori
|
b2691a3b0a
|
save adjacency list as JoinedEntity
|
2020-01-30 17:46:29 +01:00 |
|
Claudio Atzori
|
8c2aff99b0
|
joining entities using T x R x S, WIP: last representation based on LinkedEntity type
|
2020-01-29 15:40:33 +01:00 |
|
Sandro La Bruzzo
|
19a80e4638
|
implemented workfow for aggregation and generation of infospace graph
|
2020-01-24 09:58:55 +01:00 |
|
Claudio Atzori
|
fcbc4ccd70
|
a bit of docs doesn't hurt
|
2020-01-24 08:43:23 +01:00 |
|
Claudio Atzori
|
a55f5fecc6
|
joining entities using T x R x S method with groupByKey, WIP: making target objects (T) have lower memory footprint
|
2020-01-24 08:17:53 +01:00 |
|
Michele Artini
|
6bfe2dc96e
|
partial implementation
|
2020-01-22 16:00:23 +01:00 |
|
Claudio Atzori
|
799929c1e3
|
joining entities using T x R x S method with groupByKey
|
2020-01-21 16:35:44 +01:00 |
|
Michele Artini
|
f6eccdde33
|
partial implementation
|
2020-01-21 14:17:05 +01:00 |
|
Michele Artini
|
cd114f1c3b
|
partial update
|
2020-01-21 12:32:10 +01:00 |
|
Michele Artini
|
b35c59eb42
|
partial implementation of entities from db
|
2020-01-20 16:04:19 +01:00 |
|
Michele Artini
|
81f82b5d34
|
partial implementation of applications to migrate entities
|
2020-01-17 15:26:21 +01:00 |
|
Claudio Atzori
|
1cd6899480
|
merged from master
|
2020-01-17 14:25:57 +01:00 |
|
Claudio Atzori
|
97c239ee0d
|
WIP: trying to find a way to build the records for the index
|
2020-01-16 12:02:28 +02:00 |
miconis
|
4955be0197
|
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
|
2020-01-14 15:03:44 +02:00 |
|
miconis
|
f61adfc2bb
|
minor changes
|
2020-01-14 15:03:27 +02:00 |
|
miconis
|
9bdcb02179
|
minor changes and update of the configuration for publications
|
2020-01-14 15:01:03 +02:00 |
|
Michele Artini
|
f7b9a7a9af
|
entity migration (partial implementation)
|
2020-01-10 15:55:23 +01:00 |
|
Michele Artini
|
7229fecbcf
|
fix warnings in poms
|
2019-12-20 13:41:08 +01:00 |
|
Sandro La Bruzzo
|
dd21db7036
|
fixed stuff
|
2019-12-18 16:28:22 +01:00 |
|
Claudio Atzori
|
7ba586d2e5
|
oozie workflow aimed to build the adjacency lists representation of the graph, needed to build the records to be indexed
|
2019-12-17 16:24:49 +01:00 |
|
Sandro La Bruzzo
|
76efcde4fd
|
using new branch decisionTreeDedup
|
2019-12-13 12:20:35 +01:00 |
|
Sandro La Bruzzo
|
b4392f9f43
|
implemented DedupRecord factory for missing entities
|
2019-12-13 09:40:02 +01:00 |
|
Sandro La Bruzzo
|
39367676d7
|
implemented DedupRecord factory with the merge of project
|
2019-12-12 15:18:48 +01:00 |
|
Sandro La Bruzzo
|
6b45e37e22
|
implemented DedupRecord factory with the merge of organizations
|
2019-12-11 16:57:37 +01:00 |
|
Sandro La Bruzzo
|
abd9034da0
|
implemented DedupRecord factory with the merge of publications
|
2019-12-11 15:43:24 +01:00 |
|
miconis
|
4b66b471a4
|
implementation of the sorting by trust mechanism and the merge of oaf entities
|
2019-12-10 14:57:16 +01:00 |
|
Sandro La Bruzzo
|
cc63706347
|
Implemented deduplication on spark
|
2019-12-06 13:38:00 +01:00 |
|
Sandro La Bruzzo
|
aad0cb40b7
|
Added schema Scholexplorer
|
2019-11-14 10:34:09 +01:00 |
|
Claudio Atzori
|
5711e75f67
|
use ${project.version} whenever possible
|
2019-11-08 17:41:51 +01:00 |
|
Claudio Atzori
|
245b4cbbb3
|
removed import limit
|
2019-11-08 17:41:01 +01:00 |
|
Claudio Atzori
|
7fe6835b47
|
[maven-release-plugin] prepare for next development iteration
|
2019-11-07 17:39:30 +01:00 |
|
Claudio Atzori
|
58918967d9
|
[maven-release-plugin] prepare release dhp-1.0.4
|
2019-11-07 17:39:27 +01:00 |
|
Claudio Atzori
|
5308f05a02
|
allow to speficy the target hive DB name in the infospace import workflow
|
2019-11-07 17:38:09 +01:00 |
|
Claudio Atzori
|
a52d5bde4f
|
simplified import procedure, maps the infospace as hive tables
|
2019-11-06 17:45:52 +01:00 |
|
Claudio Atzori
|
1e7a2ac41d
|
align parmeter names, graph import procedure WIP
|
2019-11-04 17:41:01 +01:00 |
|
Claudio Atzori
|
f39148dab8
|
[maven-release-plugin] prepare for next development iteration
|
2019-11-04 12:34:48 +01:00 |
|
Claudio Atzori
|
34b0e7b40a
|
[maven-release-plugin] prepare release dhp-1.0.3
|
2019-11-04 12:34:46 +01:00 |
|
Claudio Atzori
|
439ad80d81
|
conversion utilities from protobuffer model to DHP model moved in dnet-mapreduce-jobs. Removed also the relative protobuf dependencies
|
2019-11-04 12:33:23 +01:00 |
|
Claudio Atzori
|
32ed4ae8d6
|
conversion utilities from protobuffer model to DHP model moved in dnet-mapreduce-jobs. Removed also the relative protobuf dependencies
|
2019-11-04 12:28:56 +01:00 |
|
Sandro La Bruzzo
|
fd0ad82111
|
[maven-release-plugin] prepare for next development iteration
|
2019-10-31 12:08:51 +01:00 |
|
Sandro La Bruzzo
|
f224613b40
|
[maven-release-plugin] prepare release dhp-1.0.2
|
2019-10-31 12:08:49 +01:00 |
|
Sandro La Bruzzo
|
e13c30cc96
|
[maven-release-plugin] rollback the release of dhp-1.0.2
|
2019-10-31 12:07:04 +01:00 |
|
Sandro La Bruzzo
|
4da5239203
|
[maven-release-plugin] prepare release dhp-1.0.2
|
2019-10-31 12:06:14 +01:00 |
|
Sandro La Bruzzo
|
db8b346edd
|
[maven-release-plugin] rollback the release of 1.0.1
|
2019-10-31 11:49:05 +01:00 |
|
Sandro La Bruzzo
|
fc80052173
|
[maven-release-plugin] prepare for next development iteration
|
2019-10-31 11:47:42 +01:00 |
|
Sandro La Bruzzo
|
3150c7ce6d
|
[maven-release-plugin] prepare release 1.0.1
|
2019-10-31 11:47:40 +01:00 |
|
Sandro La Bruzzo
|
18ec8e8147
|
moved protoutils function to dhp-schemas
|
2019-10-31 11:31:37 +01:00 |
|
Sandro La Bruzzo
|
997e57d45b
|
Added entity filter to spark class
|
2019-10-30 12:19:03 +01:00 |
|
Sandro La Bruzzo
|
a336956708
|
added defautl property to job
|
2019-10-30 12:01:42 +01:00 |
|
Claudio Atzori
|
78b5b57e86
|
trying to make the spark action to be run as spark2
|
2019-10-29 18:56:34 +01:00 |
|
Claudio Atzori
|
c8bb81cd9a
|
align dependencies with IIS cluster
|
2019-10-29 18:10:20 +01:00 |
|
Sandro La Bruzzo
|
fe62ccd6dd
|
implemented oozie wf
|
2019-10-28 12:12:50 +01:00 |
|
Sandro La Bruzzo
|
9ee4e5a196
|
remove a bit of syntactic sugar on the object inheritance :(
|
2019-10-25 18:10:30 +02:00 |
|
Sandro La Bruzzo
|
c74335ebc7
|
resolved conflict
|
2019-10-25 14:34:50 +02:00 |
|
Sandro La Bruzzo
|
8c902c500a
|
minor fix
|
2019-10-25 14:33:54 +02:00 |
|
miconis
|
9fa5aebe9c
|
minor changes
|
2019-10-25 12:52:28 +02:00 |
|
miconis
|
551eda1600
|
dataset, orp and software mapping implemented. addition of test resources for results. implementation of tests to check the result of the mapping
|
2019-10-25 12:48:25 +02:00 |
|
Sandro La Bruzzo
|
eef14fade3
|
fixed conflict
|
2019-10-25 11:58:20 +02:00 |
|
Sandro La Bruzzo
|
0ea7e861ab
|
added organizations test
|
2019-10-25 11:56:28 +02:00 |
|
miconis
|
4908165e05
|
implementation of the createPublication method to map publications
|
2019-10-25 11:54:14 +02:00 |
|
miconis
|
df37bd6aaf
|
placeholders for setters in createpublication
|
2019-10-25 10:57:19 +02:00 |
|
Sandro La Bruzzo
|
c8d6d6bbd1
|
implemented organization mapping
|
2019-10-25 10:23:51 +02:00 |
|
miconis
|
b525b54130
|
starting implementing the createPublication class
|
2019-10-25 09:55:31 +02:00 |
|
Claudio Atzori
|
4b331790e7
|
resolved conflicts
|
2019-10-25 09:45:12 +02:00 |
|
Claudio Atzori
|
c929c1dfac
|
more proto 2 graph model mappings
|
2019-10-25 09:25:36 +02:00 |
|
Sandro La Bruzzo
|
09ffda03a2
|
removed circular dependencies
|
2019-10-25 09:24:18 +02:00 |
|
Sandro La Bruzzo
|
a10d071cf4
|
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
|
2019-10-24 17:55:44 +02:00 |
|
Sandro La Bruzzo
|
3a8bb11695
|
mapped first part
|
2019-10-24 17:55:40 +02:00 |
|
Claudio Atzori
|
d46371ceab
|
Merge branch 'master' of https://code-repo.d2science.org/D-Net/dnet-hadoop
|
2019-10-24 17:43:55 +02:00 |
|
Claudio Atzori
|
0d88f9a6a4
|
added mapping for projects
|
2019-10-24 17:43:42 +02:00 |
|
Sandro La Bruzzo
|
2dd9572f41
|
added Mapping of OriginalDescription
|
2019-10-24 17:36:44 +02:00 |
|
miconis
|
351d850ad3
|
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
|
2019-10-24 17:29:07 +02:00 |
|
miconis
|
b66a7e3030
|
publication test added
|
2019-10-24 17:29:01 +02:00 |
|
Sandro La Bruzzo
|
6c32d418ac
|
added conversion of ExtraInfo
|
2019-10-24 17:26:55 +02:00 |
|
Claudio Atzori
|
5f339a2c24
|
added mappings for basic types
|
2019-10-24 17:21:45 +02:00 |
|
Sandro La Bruzzo
|
9d04111391
|
Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop
|
2019-10-24 17:05:52 +02:00 |
|
Sandro La Bruzzo
|
0902bac7dd
|
fixed conflict
|
2019-10-24 17:05:42 +02:00 |
|
Claudio Atzori
|
d8bfaa3687
|
added mapping for relations
|
2019-10-24 17:04:13 +02:00 |
|
Sandro La Bruzzo
|
d2965636e0
|
created test for convert json into new OAF data model
|
2019-10-24 17:02:35 +02:00 |
|
Claudio Atzori
|
79c4f1bbd8
|
Protobuf to internal graph model, early steps
|
2019-10-24 16:56:13 +02:00 |
|
Claudio Atzori
|
d38aeb8c6e
|
DataInfo.provenanceaction not repeatable, fluent setters
|
2019-10-24 16:55:38 +02:00 |
|
Sandro La Bruzzo
|
5744a64478
|
added module dhp=graph-mapper
|
2019-10-24 16:00:28 +02:00 |
|
Sandro La Bruzzo
|
5a8a323f2a
|
dhp-collection-worker integrated in dhp-workflows
|
2019-10-24 11:36:59 +02:00 |
|
Claudio Atzori
|
dd1d6fcb01
|
moved libs in main pom file
|
2019-10-18 10:50:55 +02:00 |
|
Claudio Atzori
|
176a13601b
|
commented out maven plugin for integration tests
|
2019-10-18 10:50:32 +02:00 |
|
Claudio Atzori
|
0c284e0a51
|
doc
|
2019-10-18 09:42:41 +02:00 |
|
Claudio Atzori
|
c7654b6fe3
|
renamed collection & transformation oozie workflow files
|
2019-10-18 09:42:20 +02:00 |
|
Claudio Atzori
|
44d7e85797
|
imported oozie-installer.markdown docs from https://github.com/openaire/iis/blob/master/iis-wf/docs/oozie-installer.markdown
|
2019-10-17 18:43:43 +02:00 |
|
Claudio Atzori
|
27db5afdad
|
integrating the oozie workflow build/deploy/run mechanism, took inspiration from iis
|
2019-10-17 18:38:30 +02:00 |
|
Sandro La Bruzzo
|
bbb87d0e3d
|
implemented saxonHE on transformation spark job
|
2019-10-10 11:33:51 +02:00 |
|
Sandro La Bruzzo
|
4b8c7c279d
|
Added documentation on a class, and reused ArgumetApplicationParser on dhp-aggregation
|
2019-10-07 17:02:53 +02:00 |
|
Sandro La Bruzzo
|
53ec9bccca
|
changed the implemetation of RabitMQ Comunication
|
2019-04-16 12:28:01 +02:00 |
|
Sandro La Bruzzo
|
403c13eebf
|
Implemented message manager, Fixed bug on collection worker, implemented Collecion and Transform spark job
|
2019-04-11 15:39:29 +02:00 |
|
Sandro La Bruzzo
|
ded6aef5e1
|
moved collector worker
|
2019-04-03 16:05:16 +02:00 |
|
Sandro La Bruzzo
|
c2ecbf5572
|
moved collector worker
|
2019-04-03 16:03:36 +02:00 |
enricoottonello
|
b316467608
|
added common module
|
2019-04-03 10:53:54 +02:00 |
|
Sandro La Bruzzo
|
12c65eab4c
|
implemented command line
|
2019-03-25 15:18:31 +01:00 |
|
Sandro La Bruzzo
|
6156562893
|
Added test
|
2019-03-18 10:47:28 +01:00 |
|
Sandro La Bruzzo
|
e67d9ee1a9
|
added first implementation of dnet-workflows
|
2019-03-18 10:44:35 +01:00 |