From a7c4d0d16d6de8af220cfa953eaecd1235da19b1 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 13 Jan 2022 13:52:00 +0100
Subject: [PATCH 1/2] [DoiBoost Organizations] added parameter to specify the
 action in the wf raw_organizations to be able to load the openorgs
 organization as in the loading step for the construction of the graph

---
 .../oa/graph/raw_organizations/oozie_app/workflow.xml    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/raw_organizations/oozie_app/workflow.xml b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/raw_organizations/oozie_app/workflow.xml
index fb6e02555..70ecef154 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/raw_organizations/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/raw_organizations/oozie_app/workflow.xml
@@ -43,13 +43,18 @@
             <value>beta</value>
             <description>the database schema according to the D-Net infrastructure (beta or production)</description>
         </property>
+        <property>
+            <name>openOrgsAction</name>
+            <value>openorgs_dedup</value>
+            <description>The action to be executed during the import for OpenOrgs</description>
+        </property>
         <property>
             <name>isLookupUrl</name>
             <description>the address of the lookUp service</description>
         </property>
         <property>
             <name>nsPrefixBlacklist</name>
-            <value></value>
+            <value>foo</value>
             <description>a blacklist of nsprefixes (comma separeted)</description>
         </property>
         <property>
@@ -156,7 +161,7 @@
             <arg>--postgresUser</arg><arg>${postgresOpenOrgsUser}</arg>
             <arg>--postgresPassword</arg><arg>${postgresOpenOrgsPassword}</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>--nsPrefixBlacklist</arg><arg>${nsPrefixBlacklist}</arg>
         </java>

From 42e8f76778c23b1167f4ae62486dc19ea0ac404b Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 13 Jan 2022 16:06:43 +0100
Subject: [PATCH 2/2] [GraphCleaning] change the return value in the filtering
 function to avoid to lose the APC entities

---
 .../eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
index 37f5573d0..351bd2dd5 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
@@ -101,7 +101,7 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 									.orElse(true))
 							.orElse(true))
 					.orElse(true))) {
-			return false;
+			return true;
 		}
 
 		if (value instanceof Datasource) {