D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 12 Projects 2 Releases 2 Wiki Activity

master #11

Manually merged
claudio.atzori merged 275 commits from :master into enrichment_wfs 2020-05-11 15:14:56 +02:00
Conversation 1 Commits 275 Files Changed 156 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c4987dd12a - Show all commits

2
dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/PrepareDatasourceCountryAssociation.java
View File

@ -107,7 +107,7 @@ public class PrepareDatasourceCountryAssociation {
getConstraintList("datasourcetype.classid = '", allowedtypes) + ") d " + getConstraintList("datasourcetype.classid = '", allowedtypes) + ") d " +
"JOIN ( SELECT source, target " + "JOIN ( SELECT source, target " +
" FROM relation " + " FROM relation " +
" WHERE relclass = 'provides' " + " WHERE relclass = '" + RELATION_DATASOURCE_ORGANIZATION_REL_CLASS + "' " +
" AND datainfo.deletedbyinference = false ) rel " + " AND datainfo.deletedbyinference = false ) rel " +
"ON d.id = rel.source " + "ON d.id = rel.source " +
"JOIN (SELECT id, country " + "JOIN (SELECT id, country " +