From 70b62a22d52adc33bc2a01034d1d66c0f1f7a2b9 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 22 Jun 2017 09:50:21 +0200 Subject: [PATCH 1/2] removed redundant override in Manage2SailResultDocumentProvider Change-Id: I1a9b62467a3432f1e929e44fe67873caf8044dd2 --- .../resultimport/Manage2SailResultDocumentProvider.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Manage2SailResultDocumentProvider.java b/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Manage2SailResultDocumentProvider.java index 038f6a05ebf..d736113ad18 100644 --- a/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Manage2SailResultDocumentProvider.java +++ b/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Manage2SailResultDocumentProvider.java @@ -1,10 +1,8 @@ package com.sap.sailing.manage2sail.resultimport; -import java.io.IOException; import java.net.URL; import com.sap.sailing.manage2sail.RegattaResultDescriptor; -import com.sap.sailing.resultimport.ResultDocumentDescriptor; import com.sap.sailing.resultimport.ResultDocumentProvider; import com.sap.sailing.resultimport.ResultUrlProvider; @@ -14,11 +12,6 @@ public class Manage2SailResultDocumentProvider extends AbstractManage2SailResult super(resultUrlProvider); } - @Override - public Iterable getResultDocumentDescriptors() throws IOException { - return super.getResultDocumentDescriptors(); - } - @Override protected URL getDocumentUrlForRegatta(RegattaResultDescriptor regattaResult) { final URL resultUrl; From e156534a1eaefcbd53be4724ac1c2b824f39cc4e Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 22 Jun 2017 10:31:16 +0200 Subject: [PATCH 2/2] fixing result import: consider time stamp to make unique for equal boat class Change-Id: If52ddc1f5d29e1972577c90e609f75083950edb7 --- .../resultimport/ScoreCorrectionProviderImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/ScoreCorrectionProviderImpl.java b/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/ScoreCorrectionProviderImpl.java index 49a12e74f0a..23f000fb158 100755 --- a/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/ScoreCorrectionProviderImpl.java +++ b/java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/ScoreCorrectionProviderImpl.java @@ -76,7 +76,7 @@ public class ScoreCorrectionProviderImpl extends AbstractManage2SailProvider imp @Override public RegattaScoreCorrections getScoreCorrections(String eventName, String boatClassName, TimePoint timePointPublished) throws IOException, SAXException, ParserConfigurationException { - Parser parser = resolveParser(eventName, boatClassName); + Parser parser = resolveParser(eventName, boatClassName, timePointPublished); try { RegattaResults regattaResults = parser.parse(); for (Object o : regattaResults.getPersonOrBoatOrTeam()) { @@ -107,14 +107,15 @@ public class ScoreCorrectionProviderImpl extends AbstractManage2SailProvider imp return null; } - private Parser resolveParser(String eventName, String boatClassName) throws IOException { + private Parser resolveParser(String eventName, String boatClassName, TimePoint timePointPublished) throws IOException { Parser result = null; for (ResultDocumentDescriptor resultDocDescr : documentProvider.getResultDocumentDescriptors()) { String boatClassAndGenderType = resultDocDescr.getBoatClass(); if (resultDocDescr.getCompetitorGenderType() != null) { boatClassAndGenderType += ", " + resultDocDescr.getCompetitorGenderType().name(); } - if (eventName.equals(resultDocDescr.getEventName()) && boatClassName.equals(boatClassAndGenderType)) { + if (eventName.equals(resultDocDescr.getEventName()) && boatClassName.equals(boatClassAndGenderType) && + Util.equalsWithNull(resultDocDescr.getLastModified(), timePointPublished)) { result = getParserFactory().createParser(resultDocDescr.getInputStream(), resultDocDescr.getEventName()); break; }