diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java index 41b4f0c0f77..9b2abbb65c8 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java @@ -397,7 +397,7 @@ public class ExpeditionAllInOneImporter { private int getNextAvailableStartBasedSessionCount(Regatta regatta) { int maxNumberFound = 0; - final Pattern pattern = Pattern.compile(START_PER_SESSION_RACE_COLUMN_NAME_PREFIX+"\\([0-9]+\\)"); + final Pattern pattern = Pattern.compile(START_PER_SESSION_RACE_COLUMN_NAME_PREFIX+"([0-9]+)"); for (final RaceColumn raceColumn : regatta.getRaceColumns()) { Matcher matcher = pattern.matcher(raceColumn.getName()); if (matcher.matches()) { diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionCourseInferrer.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionCourseInferrer.java index 9e01a992dfc..47b672dfa68 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionCourseInferrer.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionCourseInferrer.java @@ -21,6 +21,7 @@ import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.common.PassingInstruction; +import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.sensordata.ExpeditionExtendedSensorDataMetadata; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -29,6 +30,7 @@ import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter; import com.sap.sailing.domain.trackimport.FormatNotSupportedException; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sailing.domain.tracking.impl.TrackedRaceStatusImpl; import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.trackfiles.impl.CompressedStreamsUtil; import com.sap.sailing.server.trackfiles.impl.ExpeditionExtendedDataImporterImpl; @@ -135,9 +137,15 @@ public class ExpeditionCourseInferrer { * up in the tracked races. If not found, such marks are defined through the regatta log. */ public void setStartLine(ExpeditionStartData startData, Iterable trackedRaces, RacingEventService racingEventService) { + for (final DynamicTrackedRace trackedRace : trackedRaces) { + trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.LOADING, 0.5)); + } for (final DynamicTrackedRace trackedRace : trackedRaces) { setStartLine(startData, trackedRace, racingEventService); } + for (final DynamicTrackedRace trackedRace : trackedRaces) { + trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.TRACKING, 1.0)); + } } private void setStartLine(ExpeditionStartData startData, DynamicTrackedRace trackedRace, RacingEventService racingEventService) {