diff --git a/src/main/java/org/gcube/dataharvest/harvester/VREAccessesHarvester.java b/src/main/java/org/gcube/dataharvest/harvester/VREAccessesHarvester.java index 0652cd8..e6ec6d4 100644 --- a/src/main/java/org/gcube/dataharvest/harvester/VREAccessesHarvester.java +++ b/src/main/java/org/gcube/dataharvest/harvester/VREAccessesHarvester.java @@ -92,21 +92,26 @@ public class VREAccessesHarvester extends BasicHarvester { int measure = 0; ScopeBean scopeBean = new ScopeBean(context); - - String[] splitContext = context.split("/"); - if (splitContext.length > 3) { - String lowerCasedContext = splitContext[3].toLowerCase(); - for (VREAccessesReportRow row : vreAccesses) { - - String pagePath = row.getPagePath(); - String[] splits = pagePath.split("/"); - if (splits.length > 2 && splits[2].startsWith(lowerCasedContext)) + String lowerCasedContext = scopeBean.name().toLowerCase(); + String case1=lowerCasedContext+"/"; + String case2=lowerCasedContext+"?"; + for (VREAccessesReportRow row : vreAccesses) { + String pagePath = row.getPagePath(); + if (!pagePath.contains("_redirect=/group")) { + if (pagePath.endsWith(lowerCasedContext)) { + System.out.println("match end->"+pagePath); measure++; + } + else if (pagePath.contains(case1) || pagePath.contains(case2) ) { + System.out.println("match compare->"+pagePath); + measure++; + } } - HarvestedData harvest = new HarvestedData(HarvestedDataKey.ACCESSES, context, measure); - logger.debug(harvest.toString()); - data.add(harvest); - } + } + + HarvestedData harvest = new HarvestedData(HarvestedDataKey.ACCESSES, context, measure); + logger.debug(harvest.toString()); + data.add(harvest); return data; } catch(Exception e) { throw e;