From 812bd54c57d63994fde566bb4f6a41bf1cee5d2f Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Thu, 19 Aug 2021 11:30:14 +0200
Subject: [PATCH 1/2] different funders in blacklist from BETA and PROD
 aggregator

---
 .../dhp/provision/00_beta_graph_for_IIS.xml   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/00_beta_graph_for_IIS.xml b/dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/00_beta_graph_for_IIS.xml
index ef2205e322..2fed35f448 100644
--- a/dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/00_beta_graph_for_IIS.xml
+++ b/dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/00_beta_graph_for_IIS.xml
@@ -11,10 +11,20 @@
         <WORKFLOW_TYPE>IIS</WORKFLOW_TYPE>
         <WORKFLOW_PRIORITY>30</WORKFLOW_PRIORITY>
         <CONFIGURATION start="manual">
-            <NODE isStart="true" name="setNsPrefixBlacklist" type="SetEnvParameter">
-                <DESCRIPTION>set blacklist of funder nsPrefixes</DESCRIPTION>
+            <NODE isStart="true" name="setNsPrefixBlacklistForBETA" type="SetEnvParameter">
+                <DESCRIPTION>set blacklist of funder nsPrefixes from the beta aggregator</DESCRIPTION>
                 <PARAMETERS>
-                    <PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist</PARAM>
+                    <PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist_BETA</PARAM>
+                    <PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________,fct_________</PARAM>
+                </PARAMETERS>
+                <ARCS>
+                    <ARC to="waitConfig"/>
+                </ARCS>
+            </NODE>
+            <NODE isStart="true" name="setNsPrefixBlacklistForPROD" type="SetEnvParameter">
+                <DESCRIPTION>set blacklist of funder nsPrefixes from the production aggregator</DESCRIPTION>
+                <PARAMETERS>
+                    <PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist_PROD</PARAM>
                     <PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________</PARAM>
                 </PARAMETERS>
                 <ARCS>
@@ -375,7 +385,7 @@
                         'reuseOAF' : 'reuseOAF_BETA',
                         'reuseOAF_hdfs' : 'reuseOAFhdfs_BETA',
                         'contentPath' : 'betaContentPath',
-                        'nsPrefixBlacklist' : 'nsPrefixBlacklist',
+                        'nsPrefixBlacklist' : 'nsPrefixBlacklist_BETA',
                         'shouldPatchRelations' : 'shouldPatchRelations_BETA',
                         'idMappingPath' : 'idMappingPath'
                         }
@@ -421,7 +431,7 @@
                         'reuseOAF' : 'reuseOAF_PROD',
                         'reuseOAF_hdfs' : 'reuseOAFhdfs_PROD',
                         'contentPath' : 'prodContentPath',
-                        'nsPrefixBlacklist' : 'nsPrefixBlacklist',
+                        'nsPrefixBlacklist' : 'nsPrefixBlacklist_PROD',
                         'shouldPatchRelations' : 'shouldPatchRelations_PROD',
                         'idMappingPath' : 'idMappingPath'
                         }

From a053e1513cf489f997c88d583d2d59a8a10ae378 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Thu, 19 Aug 2021 11:32:27 +0200
Subject: [PATCH 2/2] different funders in blacklist from BETA and PROD
 aggregator

---
 .../dnetlib/dhp/provision/02_beta_graph.xml   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/02_beta_graph.xml b/dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/02_beta_graph.xml
index 344e99044b..f83337b3cc 100644
--- a/dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/02_beta_graph.xml
+++ b/dhp-workflows/dhp-workflow-profiles/src/main/resources/eu/dnetlib/dhp/provision/02_beta_graph.xml
@@ -11,10 +11,20 @@
         <WORKFLOW_TYPE>Data Provision</WORKFLOW_TYPE>
         <WORKFLOW_PRIORITY>30</WORKFLOW_PRIORITY>
         <CONFIGURATION start="manual">
-            <NODE isStart="true" name="setNsPrefixBlacklist" type="SetEnvParameter">
-                <DESCRIPTION>set blacklist of funder nsPrefixes</DESCRIPTION>
+            <NODE isStart="true" name="setNsPrefixBlacklistForBETA" type="SetEnvParameter">
+                <DESCRIPTION>set blacklist of funder nsPrefixes from the beta aggregator</DESCRIPTION>
                 <PARAMETERS>
-                    <PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist</PARAM>
+                    <PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist_BETA</PARAM>
+                    <PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________,fct_________</PARAM>
+                </PARAMETERS>
+                <ARCS>
+                    <ARC to="waitConfig"/>
+                </ARCS>
+            </NODE>
+            <NODE isStart="true" name="setNsPrefixBlacklistForPROD" type="SetEnvParameter">
+                <DESCRIPTION>set blacklist of funder nsPrefixes from the production aggregator</DESCRIPTION>
+                <PARAMETERS>
+                    <PARAM managedBy="system" name="parameterName" required="true" type="string">nsPrefixBlacklist_PROD</PARAM>
                     <PARAM managedBy="user" name="parameterValue" required="true" type="string">gsrt________,rcuk________</PARAM>
                 </PARAMETERS>
                 <ARCS>
@@ -497,7 +507,7 @@
                         'reuseOAF' : 'reuseOAF_BETA',
                         'reuseOAF_hdfs' : 'reuseOAFhdfs_BETA',
                         'contentPath' : 'betaContentPath',
-                        'nsPrefixBlacklist' : 'nsPrefixBlacklist',
+                        'nsPrefixBlacklist' : 'nsPrefixBlacklist_BETA',
                         'shouldPatchRelations' : 'shouldPatchRelations_BETA',
                         'idMappingPath' : 'idMappingPath'
                         }
@@ -543,7 +553,7 @@
                         'reuseOAF' : 'reuseOAF_PROD',
                         'reuseOAF_hdfs' : 'reuseOAFhdfs_PROD',
                         'contentPath' : 'prodContentPath',
-                        'nsPrefixBlacklist' : 'nsPrefixBlacklist',
+                        'nsPrefixBlacklist' : 'nsPrefixBlacklist_PROD',
                         'shouldPatchRelations' : 'shouldPatchRelations_PROD',
                         'idMappingPath' : 'idMappingPath'
                         }