reportItems = new ArrayList();
+ usageStatsRepository.executeBatchItemsPR(reportItems, repositoryIdentifier, beginDateParsed, endDateParsed, metricType, dataType, granularity);
+ if (reportItems.isEmpty()) {
+ reportExceptions.add(new SUSHI_Error_Model("3030", "Error", "usagecounts.openaire.eu", "No Usage Available for Requested Dates", "Service did not find any data"));
+ }
+
+ if (reportExceptions.size() == 0) {
+ reportExceptions = null;
+ }
+ COUNTER_Platform_Report reportPr = new COUNTER_Platform_Report(dateTime.format(formatter), repositoryIdentifier, reportID, reportName, insitutionName, institutionIdD, reportExceptions, reportFilters, reportItems);
return reportPr;
}
@Override
public String displayReportPR(String repositoryIdentifier, String beginDate,
- String endDate, String metricType, String granularity) {
+ String endDate, String metricType, String dataType, String granularity) {
ObjectMapper objectMapper = new ObjectMapper();
log.info((beginDate + " " + endDate));
try {
- return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportPR(repositoryIdentifier, beginDate, endDate, metricType, granularity)) + "
";
+ return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportPR(repositoryIdentifier, beginDate, endDate, metricType, dataType, granularity)) + "
";
} catch (JsonProcessingException ex) {
java.util.logging.Logger.getLogger(SushiLiteServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -481,6 +560,19 @@ public class SushiLiteServiceImpl implements SushiLiteService {
java.util.logging.Logger.getLogger(SushiLiteServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
}
return null;
+
+ }
+ @Override
+ public String displayReportTR(String repositoryIdentifier, String itemIdentifier,String beginDate,
+ String endDate, String metricType, String dataType, String granularity) {
+ ObjectMapper objectMapper = new ObjectMapper();
+ log.info((beginDate + " " + endDate));
+ try {
+ return "" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(buildReportPR(repositoryIdentifier, beginDate, endDate, metricType, dataType, granularity)) + "
";
+ } catch (JsonProcessingException ex) {
+ java.util.logging.Logger.getLogger(SushiLiteServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ return null;
}
}
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 270177e..ea54386 100755
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -9,16 +9,16 @@ log4j.additivity.org.springframework = false
log4j.appender.R=org.apache.log4j.RollingFileAppender
#log4j.appender.R.File=/var/log/dnet/usageStatsAPI/usageStatsAPI.log
-#log4j.appender.R.File=/Users/dpie/Desktop/usageStatsAPI.log
-log4j.appender.R.File=/Volumes/Zeus/dpie/Desktop/usageStatsAPI.log
+log4j.appender.R.File=/Users/dpie/Desktop/usageStatsAPI.log
+#log4j.appender.R.File=/Volumes/Zeus/dpie/Desktop/usageStatsAPI.log
loglog4j.appender.R.MaxFileSize=10MB
log4j.appender.R.MaxBackupIndex=10
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
log4j.appender.S=org.apache.log4j.RollingFileAppender
#log4j.appender.S.File=/var/log/dnet/usageStatsAPI/usageStatsAPI-spring.log
-#log4j.appender.S.File=/Users/dpie/Desktop/usageStatsAPI-spring.log
-log4j.appender.S.File=/Volumes/Zeus/dpie/Desktop/usageStatsAPI-spring.log
+log4j.appender.S.File=/Users/dpie/Desktop/usageStatsAPI-spring.log
+#log4j.appender.S.File=/Volumes/Zeus/dpie/Desktop/usageStatsAPI-spring.log
log4j.appender.S.MaxFileSize=10MB
log4j.appender.S.MaxBackupIndex=10
log4j.appender.S.layout=org.apache.log4j.PatternLayout
diff --git a/src/main/resources/usageStatsAPI.properties b/src/main/resources/usageStatsAPI.properties
new file mode 100644
index 0000000..0e6c1ae
--- /dev/null
+++ b/src/main/resources/usageStatsAPI.properties
@@ -0,0 +1,20 @@
+name=usageStatsAPI
+logging.config=log4j.properties
+usagestats.driverClassName=com.cloudera.impala.jdbc41.Driver
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.HSQLDialect
+usagestats.url=jdbc:impala://iis-cdh5-test-gw.ocean.icm.edu.pl:21050/;UseNativeQuery=1;AutoReconnect=1
+usagestats.username=sqoop
+usagestats.password=sqoop
+usagestats.redis.hostname=localhost
+usagestats.redis.port=6379
+spring.jackson.serialization.INDENT_OUTPUT=true
+prod.statsdb=openaire_prod_stats
+prod.usagestatsImpalaDB=openaire_prod_usage_stats
+compression.max_number_of_records=100
+download.folder=/Users/dpie/Desktop/DownloadSushiLite
+sushi-lite.server=http://localhost:8080/usagestats
+server.context-path=/usagestats_r5
+server.port=8080
+#spring.datasource.testWhileIdle = true
+#spring.datasource.timeBetweenEvictionRunsMillis = 60000
+#spring.datasource.validationQuery = SELECT 1
\ No newline at end of file