From 3d5904fb41d70efd7f60d0b50e8bb6c59de1e247 Mon Sep 17 00:00:00 2001 From: Spyros Zoupanos Date: Sun, 13 Sep 2020 15:01:29 +0300 Subject: [PATCH] More proper naming to methods --- .../eu/dnetlib/oa/graph/usagestats/export/IrusStats.java | 6 +++--- .../oa/graph/usagestats/export/UsageStatsExporter.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/IrusStats.java b/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/IrusStats.java index 5f7166cdba..1f94db0558 100644 --- a/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/IrusStats.java +++ b/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/IrusStats.java @@ -136,7 +136,7 @@ public class IrusStats { ConnectDB.getConnection().close(); } - public void processIrusRRReport(String irusUKReportPath) throws Exception { + public void getIrusRRReport(String irusUKReportPath) throws Exception { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-MM"); String reportUrl = irusUKURL + "GetReport/?Report=RR1&Release=4&RequestorID=OpenAIRE&BeginDate=2016-01&EndDate=" + simpleDateFormat.format(new Date()) @@ -166,7 +166,7 @@ public class IrusStats { // System.out.println(i + ": " + opendoar.get("Value").toString()); log.info(i + ": " + opendoar.get("Value").toString()); i++; - processIrusIRReport(opendoar.get("Value").toString(), irusUKReportPath); + getIrusIRReport(opendoar.get("Value").toString(), irusUKReportPath); break; } } @@ -176,7 +176,7 @@ public class IrusStats { System.out.println("====> (processIrusRRReport) Finished with report: " + reportUrl); } - private void processIrusIRReport(String opendoar, String irusUKReportPath) throws Exception { + private void getIrusIRReport(String opendoar, String irusUKReportPath) throws Exception { System.out.println("====> (processIrusIRReport) Getting report(s) with opendoar: " + opendoar); diff --git a/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/UsageStatsExporter.java b/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/UsageStatsExporter.java index 1efc616973..91135fd0e4 100644 --- a/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/UsageStatsExporter.java +++ b/dhp-workflows/dhp-usage-stats-update/src/main/java/eu/dnetlib/oa/graph/usagestats/export/UsageStatsExporter.java @@ -57,13 +57,13 @@ public class UsageStatsExporter { String cRobotsUrl = "https://raw.githubusercontent.com/atmire/COUNTER-Robots/master/COUNTER_Robots_list.json"; piwikstatsdb.setCounterRobotsURL(cRobotsUrl); System.out.println("====> Processing logs"); -// piwikstatsdb.processLogs(); + piwikstatsdb.processLogs(); log.info("process logs done"); IrusStats irusstats = new IrusStats(irusUKBaseURL); - irusstats.processIrusRRReport(irusUKReportPath); +// irusstats.processIrusRRReport(irusUKReportPath); -// irusstats.irusStats(); + irusstats.irusStats(); // log.info("irus done"); System.exit(0);