added new orgs in monitor

dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step16-createIndicatorsTables.sql

@@ -335,8 +335,8 @@ select ar.organization, rf.no_result_fair/ar.no_allresults org_fairness
 from allresults ar
          join result_fair rf on rf.organization=ar.organization; /*EOS*/
 
-DROP VIEW result_fair; /*EOS*/
-DROP VIEW allresults; /*EOS*/
+DROP VIEW result_fair;
+DROP VIEW allresults;
 
 CREATE TEMPORARY VIEW result_fair as
     select year, ro.organization organization, count(distinct ro.id) no_result_fair from ${stats_db_name}.result_organization ro
@@ -1000,16 +1000,13 @@ left outer join (
 drop table if exists ${stats_db_name}.result_country purge; /*EOS*/
 
 create table ${stats_db_name}.result_country stored as parquet as
-select distinct * from (
-    select ro.id, o.country as country
-    from ${stats_db_name}.result_organization ro
-    join ${stats_db_name}.organization o on o.id=ro.organization
-    union all
-    select rp.id, f.country as country
-    from ${stats_db_name}.result_projects rp
-    left outer join ${stats_db_name}.project p on p.id=rp.project
-    left outer join ${stats_db_name}.funder f on f.name=p.funder ) u
-where u.country is not NULL; /*EOS*/
+select distinct ro.id, coalesce(o.country, f.country)
+from ${stats_db_name}.result_organization ro
+left outer join ${stats_db_name}.organization o on o.id=ro.organization
+left outer join ${stats_db_name}.result_projects rp on rp.id=ro.id
+left outer join ${stats_db_name}.project p on p.id=rp.project
+left outer join ${stats_db_name}.funder f on f.name=p.funder
+where coalesce(o.country, f.country) IS NOT NULL;
 
 drop table if exists ${stats_db_name}.indi_result_oa_with_license purge; /*EOS*/
 create table ${stats_db_name}.indi_result_oa_with_license stored as parquet as

dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step20-createMonitorDBAll.sql

@@ -78,14 +78,14 @@ create table TARGET.result stored as parquet as
              'openorgs____::4d4051b56708688235252f1d8fddb8c1',	-- Iscte - Instituto Universitário de Lisboa
              'openorgs____::5d55fb216b14691cf68218daf5d78cd9',  -- Munster Technological University
              'openorgs____::0fccc7640f0cb44d5cd1b06b312a06b9',  -- Cardiff University
-             'openorgs____::8839b55dae0c84d56fd533f52d5d483a',  -- Leibniz Institute of Ecological Urban and Regional Development
+             'openorgs____::8839b55dae0c84d56fd533f52d5d483a',   -- Leibniz Institute of Ecological Urban and Regional Development
              'openorgs____::526468206bca24c1c90da6a312295cf4',	-- Cyprus University of Technology
              'openorgs____::b5ca9d4340e26454e367e2908ef3872f',	-- Alma Mater Studiorum University of Bologna
-             'openorgs____::a6340e6ecf60f6bba163659df985b0f2',	-- TU Dresden
-             'openorgs____::64badd35233ba2cd4946368ef2f4cf57',	-- University of Vienna
+             'openorgs____::a6340e6ecf60f6bba163659df985b0f2',  -- TU Dresden
+             'openorgs____::64badd35233ba2cd4946368ef2f4cf57',  --	University of Vienna
              'openorgs____::7501d66d2297a963ebfb075c43fff88e',  -- Royal Institute of Technology
-             'openorgs____::d5eb679abdd31f70fcd4c8ba711148bf',	-- Sorbonne University
-             'openorgs____::b316f25380d106aac402f5ae8653910d'   -- Centre for Research on Ecology and Forestry Applications
+             'openorgs____::d5eb679abdd31f70fcd4c8ba711148bf',  -- Sorbonne University
+             'openorgs____::b316f25380d106aac402f5ae8653910d'  --	Centre for Research on Ecology and Forestry Applications
         ) )) foo;
 
 create view if not exists TARGET.category as select * from SOURCE.category;