From 53ce0230353177e541c2d534e96d07218ae968c5 Mon Sep 17 00:00:00 2001
From: dimitrispie <dpierrakos@gmail.com>
Date: Sun, 23 Apr 2023 18:22:26 +0300
Subject: [PATCH] Bug fixes

---
 .../eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor.sh        | 1 -
 .../dhp/oa/graph/monitor/oozie_app/scripts/createMonitorDB.sql  | 1 -
 .../eu/dnetlib/dhp/oa/graph/monitor/oozie_app/workflow.xml      | 2 --
 3 files changed, 4 deletions(-)

diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor.sh b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor.sh
index 5e0f68586..56681dc62 100644
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor.sh
+++ b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor.sh
@@ -17,7 +17,6 @@ echo "Getting file from " $SCRIPT_PATH
 hdfs dfs -copyToLocal $SCRIPT_PATH
 
 echo "Creating monitor database"
-#cat step20-createMonitorDB.sql | sed s/SOURCE/$1/g | sed s/TARGET/$2/g1 > foo
 cat createMonitorDB.sql | sed "s/TARGET/${TARGET}/g" | sed "s/SOURCE/${SOURCE}/g" > foo
 hive $HIVE_OPTS -f foo
 echo "Hive shell finished"
\ No newline at end of file
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/scripts/createMonitorDB.sql b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/scripts/createMonitorDB.sql
index aed2126af..257cb1419 100644
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/scripts/createMonitorDB.sql
+++ b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/scripts/createMonitorDB.sql
@@ -3,7 +3,6 @@ DROP TABLE IF EXISTS TARGET.result_new;
 create table TARGET.result_new stored as parquet as
     select distinct * from (
         select * from SOURCE.result r where exists (select 1 from SOURCE.result_organization ro where ro.id=r.id and ro.organization in (
---              'openorgs____::b8b8ca674452579f3f593d9f5e557483',  -- University College Cork
              'openorgs____::38d7097854736583dde879d12dacafca'	-- Brown University
         ) )) foo;
 
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/workflow.xml b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/workflow.xml
index f24dcc700..651b6fa13 100644
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/workflow.xml
@@ -93,8 +93,6 @@
             <job-tracker>${jobTracker}</job-tracker>
             <name-node>${nameNode}</name-node>
             <exec>copyDataToImpalaCluster.sh</exec>
-            <!--            <env-var>HADOOP_USER_NAME=${wf:user()}</env-var>-->
-            <!--            <argument>${external_stats_db_name}</argument>-->
             <argument>${monitor_db_name}</argument>
             <argument>${hadoop_user_name}</argument>
             <file>copyDataToImpalaCluster.sh</file>