sabeel
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'beta' into validation

This commit is contained in:
Claudio Atzori 2022-01-19 10:20:10 +01:00
parent 26b5c7bcbb 42e8f76778
commit bd97fb2dff
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
View File

@ -101,7 +101,7 @@ public class GraphCleaningFunctions extends CleaningFunctions {
.orElse(true)) .orElse(true))
.orElse(true)) .orElse(true))
.orElse(true))) { .orElse(true))) {
return false; return true;
} }
if (value instanceof Datasource) { if (value instanceof Datasource) {

9
dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/raw_organizations/oozie_app/workflow.xml
View File

@ -43,13 +43,18 @@
<value>beta</value> <value>beta</value>
<description>the database schema according to the D-Net infrastructure (beta or production)</description> <description>the database schema according to the D-Net infrastructure (beta or production)</description>
</property> </property>
<property>
<name>openOrgsAction</name>
<value>openorgs_dedup</value>
<description>The action to be executed during the import for OpenOrgs</description>
</property>
<property> <property>
<name>isLookupUrl</name> <name>isLookupUrl</name>
<description>the address of the lookUp service</description> <description>the address of the lookUp service</description>
</property> </property>
<property> <property>
<name>nsPrefixBlacklist</name> <name>nsPrefixBlacklist</name>
<value></value> <value>foo</value>
<description>a blacklist of nsprefixes (comma separeted)</description> <description>a blacklist of nsprefixes (comma separeted)</description>
</property> </property>
<property> <property>
@ -156,7 +161,7 @@
<arg>--postgresUser</arg><arg>${postgresOpenOrgsUser}</arg> <arg>--postgresUser</arg><arg>${postgresOpenOrgsUser}</arg>
<arg>--postgresPassword</arg><arg>${postgresOpenOrgsPassword}</arg> <arg>--postgresPassword</arg><arg>${postgresOpenOrgsPassword}</arg>
<arg>--isLookupUrl</arg><arg>${isLookupUrl}</arg> <arg>--isLookupUrl</arg><arg>${isLookupUrl}</arg>
<arg>--action</arg><arg>openorgs_dedup</arg> <arg>--action</arg><arg>${openOrgsAction}</arg>
<arg>--dbschema</arg><arg>${dbSchema}</arg> <arg>--dbschema</arg><arg>${dbSchema}</arg>
<arg>--nsPrefixBlacklist</arg><arg>${nsPrefixBlacklist}</arg> <arg>--nsPrefixBlacklist</arg><arg>${nsPrefixBlacklist}</arg>
</java> </java>