eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-21 21:25:38 +00:00
Code Activity

bug6096: first test case green

Browse Source
This commit is contained in:
Axel Uhl
2025-02-20 17:37:57 +01:00
parent a2796abe1a
commit 9b6691f438
2 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.sailwave.html.resultimport/META-INF/MANIFEST.MF
+2 -1
View File
@@ -7,7 +7,8 @@ Bundle-Activator: com.sap.sailing.sailwave.html.resultimport.impl.Activator
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: com.sap.sailing.sailwave.html.resultimport
Import-Package: org.osgi.framework;version="1.3.0",
Import-Package: org.apache.commons.lang;version="[2.6.0,3.0.0)",
org.osgi.framework;version="1.3.0",
org.osgi.util.tracker;version="[1.5.0,2.0.0)"
Require-Bundle: com.sap.sailing.resultimport,
com.sap.sailing.domain.common,
java/com.sap.sailing.sailwave.html.resultimport/src/com/sap/sailing/sailwave/html/resultimport/impl/SailwaveHtmlParser.java
+34 -21
View File
@@ -5,7 +5,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -18,6 +17,8 @@ import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringEscapeUtils;
import com.sap.sailing.resultimport.CompetitorEntry;
import com.sap.sailing.resultimport.CompetitorRow;
import com.sap.sailing.resultimport.RegattaResults;
@@ -70,7 +71,7 @@ public class SailwaveHtmlParser {
return tableRows;
}
public List<String> getTagContents(String s, String tag) throws UnsupportedEncodingException {
public List<String> getTagContents(String s, String tag) {
Pattern tagPattern = Pattern.compile("<("+tag.toLowerCase()+"|"+tag.toUpperCase()+")([^<>]*)>");
Pattern slashTag = Pattern.compile("</("+tag.toLowerCase()+"|"+tag.toUpperCase()+")([^<>]*)>");
boolean inTag = false;
@@ -94,9 +95,9 @@ public class SailwaveHtmlParser {
if (foundSlashTag) {
end = slashTagMatcher.start();
inTag = false;
result.add(URLDecoder.decode(s.substring(start, end).trim(), "UTF-8"));
result.add(StringEscapeUtils.unescapeHtml(s.substring(start, end).trim()));
} else {
result.add(URLDecoder.decode(s.substring(start).trim(), "UTF-8"));
result.add(StringEscapeUtils.unescapeHtml(s.substring(start).trim()));
finished = true;
logger.warning("unclosed "+tag+" tag in string \""+s+"\"");
}
@@ -114,12 +115,12 @@ public class SailwaveHtmlParser {
final List<CompetitorRow> result = new ArrayList<CompetitorRow>();
final BufferedReader br = new BufferedReader(new InputStreamReader(is));
final Map<String, String> metadata = readMetadataBeforeTable(br);
final LinkedHashMap<String, String> columnStylesAndNames = readTableHeader(br);
final LinkedHashMap<String, String> columnNamesAndStyles = readTableHeader(br);
findTableBody(br);
final List<String> rowContents = getRowContents(br);
for (final String row : rowContents) {
final List<String> tdContent = getTagContents(row, "td");
result.add(createCompetitorRow(tdContent, columnStylesAndNames, classesCounts));
result.add(createCompetitorRow(tdContent, columnNamesAndStyles, classesCounts));
}
return new RegattaResults() {
@Override
@@ -145,7 +146,7 @@ public class SailwaveHtmlParser {
private LinkedHashMap<String, String> readTableHeader(BufferedReader br) throws IOException {
final LinkedHashMap<String, String> result = new LinkedHashMap<>();
final List<String> classes = new ArrayList<>();
final Pattern colClassPattern = Pattern.compile("<col class=\"([^\"]*)\" */>");
final Pattern colClassPattern = Pattern.compile("<col class=\"([^\"]*)\" */?>");
final Pattern colTitlePattern = Pattern.compile("<th>([^<]*)</th>");
String line;
while ((line=br.readLine()) != null && !line.contains("<colgroup"))
@@ -155,28 +156,29 @@ public class SailwaveHtmlParser {
if (colMatcher.matches()) {
classes.add(colMatcher.group(1));
}
line = br.readLine();
}
while ((line=br.readLine()) != null && !line.contains("<tr class=\"titlerow\">"))
;
final Iterator<String> classIter = classes.iterator();
while (line != null && !line.contains("</colgroup")) {
while (line != null && !line.contains("</tr")) {
final Matcher colTitleMatcher = colTitlePattern.matcher(line);
if (colTitleMatcher.matches()) {
result.put(classIter.next(), colTitleMatcher.group(1));
result.put(colTitleMatcher.group(1), classIter.next());
}
line = br.readLine();
}
return result;
}
private Map<String, String> readMetadataBeforeTable(BufferedReader br) throws IOException {
final Pattern h3MetadataElementPattern = Pattern.compile("<h3 class=\"([^\"]*)\">([^<]*)</h3>");
final Pattern divMetadataElementPattern = Pattern.compile("<div class=\"([^\"]*)\">([^<]*)</div>");
final Pattern h3MetadataElementPattern = Pattern.compile("<h3 class=\"([^\"]*)\"[^>]*>([^<]*)</h3>");
final Pattern divMetadataElementPattern = Pattern.compile("<div class=\"([^\"]*)\"[^>]*>([^<]*)</div>");
final Map<String, String> result = new HashMap<>();
String line;
while ((line=br.readLine()) != null && !line.contains("<h3"))
;
while (line != null && !line.contains("<table")) {
assert line.contains("<h3>");
final Matcher h3Matcher = h3MetadataElementPattern.matcher(line);
if (h3Matcher.matches()) {
result.put(h3Matcher.group(1), h3Matcher.group(2));
@@ -190,9 +192,10 @@ public class SailwaveHtmlParser {
return result;
}
private CompetitorRow createCompetitorRow(List<String> trContent, LinkedHashMap<String, String> columnStylesAndNames, Map<String, Integer> classesCounts) throws UnsupportedEncodingException {
final List<String> columnValues = getTagContents(trContent.get(0), "td");
final Iterator<String> columnValueIterator = columnValues.iterator();
private CompetitorRow createCompetitorRow(List<String> trContent, LinkedHashMap<String, String> columnNamesAndStyles, Map<String, Integer> classesCounts) throws UnsupportedEncodingException {
final Pattern rankPattern = Pattern.compile("([0-9]+)[A-Za-z]*"); // captures the 3 in "3rd"
final Pattern nationalityPattern = Pattern.compile("^(<img .*\\btitle=\")?([A-Za-z][A-Za-z][A-Za-z])(\".*>)?$"); // captures the 3 in "3rd"
final Iterator<String> columnValueIterator = trContent.iterator();
String nationality = null;
String sailNumber = null;
Integer totalRank = null;
@@ -200,11 +203,14 @@ public class SailwaveHtmlParser {
List<CompetitorEntry> rankAndMaxPointsReasonAndPointsAndDiscarded = new ArrayList<CompetitorEntry>();
Double scoreAfterDiscarding = null;
Double totalPointsBeforeDiscarding = null;
for (final Entry<String, String> columnStyleAndName : columnStylesAndNames.entrySet()) {
for (final Entry<String, String> columnNameAndStyle : columnNamesAndStyles.entrySet()) {
final String columnValue = columnValueIterator.next();
switch (columnStyleAndName.getKey()) {
switch (columnNameAndStyle.getValue()) {
case "rank":
totalRank = Integer.parseInt(columnValue);
final Matcher rankMatcher = rankPattern.matcher(columnValue);
if (rankMatcher.matches()) {
totalRank = Integer.parseInt(rankMatcher.group(1));
}
break;
case "class":
if (classesCounts.containsKey(columnValue)) {
@@ -214,7 +220,14 @@ public class SailwaveHtmlParser {
}
break;
case "nat":
nationality = columnValue;
// example value: <img class="natflag" title="HKG" src="ILCA6_files/HKG.jpg">
// but we should also be prepared for just the nationality string, such as "HKG"
final Matcher natMatcher = nationalityPattern.matcher(columnValue);
if (natMatcher.matches()) {
nationality = natMatcher.group(2);
} else {
nationality = columnValue;
}
break;
case "sailno":
sailNumber = columnValue;
@@ -227,10 +240,10 @@ public class SailwaveHtmlParser {
rankAndMaxPointsReasonAndPointsAndDiscarded.add(rankAndMaxPointsReasonAndPointsAndDiscardedForOnceRace);
break;
case "total":
scoreAfterDiscarding = Double.parseDouble(columnValue);
totalPointsBeforeDiscarding = Double.parseDouble(columnValue);
break;
case "nett":
totalPointsBeforeDiscarding = Double.parseDouble(columnValue);
scoreAfterDiscarding = Double.parseDouble(columnValue);
}
}
return new CompetitorRowImpl(totalRank, nationality+" "+sailNumber, names, scoreAfterDiscarding, totalPointsBeforeDiscarding,