From f53ead952a7e44d6ed15862996351909564b3f02 Mon Sep 17 00:00:00 2001 From: Dimitris Date: Wed, 13 Jan 2021 13:03:01 +0200 Subject: [PATCH] Commit pr pr_p1 reports --- .../sushilite/domain/ItemPerformance.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ItemPerformance.java b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ItemPerformance.java index a3e7c32..5cb7e9f 100755 --- a/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ItemPerformance.java +++ b/src/main/java/eu/dnetlib/usagestats/sushilite/domain/ItemPerformance.java @@ -9,16 +9,24 @@ import java.util.List; * Created by tsampikos on 31/10/2016. */ public class ItemPerformance { + private Period period; private List instances = new ArrayList<>(); public ItemPerformance() { } - public ItemPerformance(String start, String end, String ft_count, String abstr) { + public ItemPerformance(String start, String end, String ft_count, + String abstr) { period = new Period(start, end); - instances.add(new Instance("Total_Items_Requests", ft_count)); - instances.add(new Instance("Total_Items_Investigations", abstr)); + if (ft_count != null && abstr != null) { + instances.add(new Instance("Total_Items_Requests", ft_count)); + instances.add(new Instance("Total_Items_Investigations", abstr)); + } + else if(ft_count != null && abstr == null ) + instances.add(new Instance("Total_Items_Requests", ft_count)); + else if(ft_count == null && abstr != null ) + instances.add(new Instance("Total_Items_Investigations",abstr)); } @JsonProperty("Period") @@ -30,7 +38,6 @@ public class ItemPerformance { // public String getCategory() { // return "Requests"; // } - @JsonProperty("Instance") public List getInstance() { return instances;