D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 13 Projects 2 Releases 2 Wiki Activity

Update StatsAtomicActionsJob.java 

Added indi_funded_result_with_fundref indicator
This commit is contained in:
dimitrispie 2023-12-01 11:35:01 +02:00
parent 359e81b7a6
commit 48430a32a6
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dhp-workflows/dhp-stats-actionsets/src/main/java/eu/dnetlib/dhp/actionmanager/stats_actionsets/StatsAtomicActionsJob.java
View File

@ -96,14 +96,16 @@ public class StatsAtomicActionsJob implements Serializable {
.sql( .sql(
String String
.format( .format(
"select b.%s as id, is_gold, is_bronze_oa, is_hybrid,green_oa, in_diamond_journal,f.fundref as publicly_funded " "select r.%s as id, is_gold, is_bronze_oa, is_hybrid,green_oa, in_diamond_journal,f.publicly_funded as publicly_funded "
+ "from %s.indi_pub_bronze_oa b " + +
"left outer join %s.indi_pub_gold_oa g on g.id=b.id " + "from %s.publication r " +
"left outer join %s.indi_pub_hybrid h on b.id=h.id " + "left outer join %s.indi_pub_bronze_oa b on r.id=b.id " +
"left outer join %s.indi_pub_green_oa gr on b.id=gr.id " + "left outer join %s.indi_pub_gold_oa g on r.id=g.id " +
"left outer join %s.indi_pub_hybrid h on r.id=h.id " +
"left outer join %s.indi_pub_green_oa gr on r.id=gr.id " +
"left outer join %s.indi_pub_diamond d on b.id=d.id " + "left outer join %s.indi_pub_diamond d on b.id=d.id " +
"left outer join %s.indi_funded_result_with_fundref f on b.id=f.id ", "left outer join %s.indi_pub_publicly_funded f on r.id=f.id ",
resultAttributeName, dbname, dbname, dbname, dbname, dbname, dbname)) resultAttributeName, dbname, dbname, dbname, dbname, dbname, dbname, dbname))
.as(Encoders.bean(StatsResultEnhancementModel.class)) .as(Encoders.bean(StatsResultEnhancementModel.class))
.write() .write()
.mode(SaveMode.Overwrite) .mode(SaveMode.Overwrite)
@ -136,12 +138,12 @@ public class StatsAtomicActionsJob implements Serializable {
r.setIsInDiamondJournal(usm.isIn_diamond_journal()); r.setIsInDiamondJournal(usm.isIn_diamond_journal());
r.setIsGreen(usm.isGreen_oa()); r.setIsGreen(usm.isGreen_oa());
r.setPubliclyFunded(usm.isPublicly_funded()); r.setPubliclyFunded(usm.isPublicly_funded());
if (usm.isIs_bronze_oa()) if (usm.isIs_gold())
r.setOpenAccessColor(OpenAccessColor.bronze);
else if (usm.isIs_gold())
r.setOpenAccessColor(OpenAccessColor.gold); r.setOpenAccessColor(OpenAccessColor.gold);
else if (usm.isIs_hybrid()) else if (usm.isIs_hybrid())
r.setOpenAccessColor(OpenAccessColor.hybrid); r.setOpenAccessColor(OpenAccessColor.hybrid);
else if (usm.isIs_bronze_oa())
r.setOpenAccessColor(OpenAccessColor.bronze);
return r; return r;
}, Encoders.bean(Result.class)); }, Encoders.bean(Result.class));
} }