--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/CompareStations.java 2012/12/18 15:02:02 1905
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/CompareStations.java 2013/01/04 10:37:36 1906
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
+import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Map;
import java.util.Set;
@@ -91,27 +92,38 @@
sb.append("
");
StationBean bean = dao.dumpAll();
- for (StationEntry station : bean.entries) {
+ for (StationEntry station : bean.entries) {
if (station.isRegional() || station.isStrain()) {
- if (station.isRegional() ) {
- //String id = URLEncoder.encode(station.getRegional(), "ISO-8859-1");
- String id = station.getRegional();
- String uri = "/Trafikinformation/AfgangAnkomst/Afgang/" + id + "/Fjerntog";
+ String href = banedkStations.get(station.getName() );
+ String hrefCode = "null";
+ if ( href != null) {
+ String hrefParts[] = href.split("/");
+ hrefCode = URLDecoder.decode(hrefParts[4], "UTF-8");
+ }
-
- sb.append( "- " + station.getName() + "
\n" );
+ String id = "";
+ String uri = "";
+ if (station.isRegional() ) {
+ id = station.getRegional();
+ uri = "/Trafikinformation/AfgangAnkomst/Afgang/" + id + "/Fjerntog";
}
if (station.isStrain() ) {
- //String id = URLEncoder.encode(station.getStrain(), "ISO-8859-1");
- String id = station.getStrain();
- String uri = "/Trafikinformation/AfgangAnkomst/Afgang/" + id + "/S-Tog";
+ id = station.getStrain();
+ uri = "/Trafikinformation/AfgangAnkomst/Afgang/" + id + "/S-Tog";
+ }
-
- sb.append( "- " + station.getName() + "
\n" );
+ String idMismatch = "";
+ if (!hrefCode.equals(id) ) {
+ idMismatch = " ID Mismatch (DB="+id+ ", BaneDK=" + hrefCode + ")";
}
+
+
+ sb.append( "- " + station.getName() + " " + idMismatch + "
\n" );
- dbStations.add(station.getName());
+ dbStations.add(station.getName());
}
+
+
}
sb.append("
\n");