--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/12 18:41:17	1038
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/16 15:30:27	1063
@@ -11,9 +11,11 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import dk.thoerup.android.traininfo.common.DepartureBean;
+import dk.thoerup.android.traininfo.common.DepartureEntry;
+import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.StationBean;
 import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
 
@@ -63,27 +65,27 @@
 		
 		DepartureBean departureBean = new DepartureBean();
 		
-		StationBean station = stationDao.getById(stationID);
+		StationEntry station = stationDao.getById(stationID);
 		
 		departureBean.stationName = station.getName();
 		
 		if (station.getRegional() != null) {
 			DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
-			departureBean.departureEntries.addAll( tempBean.departureEntries );
+			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);
 		}
 		
 		if (station.getStrain() != null) {
 			DepartureBean tempBean = lookupDepartures(station.getStrain(), TrainType.STOG, arrival);
-			departureBean.departureEntries.addAll( tempBean.departureEntries );
+			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);
 		}		
 		
-		if (departureBean.departureEntries.size() == 0) {
+		if (departureBean.entries.size() == 0) {
 			logger.info("No departures found for station " + stationID);
 		}
 		
-		Collections.sort( departureBean.departureEntries );
+		Collections.sort( departureBean.entries );
 
 		
 		return departureBean;
@@ -131,7 +133,7 @@
 
 	    String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";	    
 	    
-	    //logger.info("URI: " + uri);	    
+	    logger.fine("URI: " + uri);	    
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
@@ -173,7 +175,7 @@
 		    		
 		    		String trainNumber = fields.get(2).text();
 		    		if (type == TrainType.STOG) //If it is S-train we need to extract the trainNumber 
-		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
+		    			trainNumber = trainNumber + " " + extractTrainNumberAzure(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
 		    		String destination = fields.get(3).text();
@@ -193,7 +195,7 @@
 		    		
 		    		departure.setType(typeString);
 		    		
-		    		departureBean.departureEntries.add( departure );
+		    		departureBean.entries.add( departure );
 		    	}
 		    }
 	    } else {
@@ -220,8 +222,8 @@
 	
 	
 	
-	String cleanText(String input) {
-		//apparently JSoup interprets some of space characters on www.bane.dk as 0xA0 
+	public static String cleanText(String input) {
+		//apparently JSoup translates   characters on www.bane.dk to 0xA0 
 		return input.replace((char) 0xA0, (char)0x20).trim();
 	}
 	
@@ -231,8 +233,13 @@
 		
 		String type = getTypeStringWww(trainType);
 		
+		stationcode = URLEncoder.encode(stationcode, "ISO-8859-1"); 
+		
 			 	    	    
 	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
+	    logger.fine("URI:" + uri);
+	    
+
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); 
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
@@ -241,11 +248,26 @@
 	    String tableName = arrival == false ? "afgangtabel" : "ankomsttabel";
 	    Element table = page.getElementById(tableName);
 	    
+
+	    
 	    if (table != null) {
 		    Elements tableRows =  table.getElementsByTag("tr");
 		    
+		    boolean passedTidsstreg = false;
+		    boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0);
+		    
 		    for (Element currentRow : tableRows) {
 		    	String rowClass = currentRow.attr("class");
+		    	
+		    	if (tidsstregExists == true && passedTidsstreg == false) {
+		    		if (currentRow.getElementsByAttributeValue("class", "Tidsstreg").size() > 0) {
+		    			passedTidsstreg = true;
+		    		} else {
+		    			continue;
+		    		}
+		    	}
+		    	
+		    	
 		    	if (rowClass != null && rowClass.toLowerCase().contains("station") ) {
 		    		Elements fields = currentRow.getElementsByTag("td");
 	
@@ -263,7 +285,7 @@
 		    		
 		    		String trainNumber = cleanText( fields.get(2).text() );
 		    		if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber 
-		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
+		    			trainNumber = trainNumber + " " + extractTrainNumberWww(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
 		    		String destination = cleanText( fields.get(3).text() );
@@ -283,7 +305,7 @@
 		    		
 		    		departure.setType(type);
 		    		
-		    		departureBean.departureEntries.add(departure);
+		    		departureBean.entries.add(departure);
 		    		
 		    		
 		    	}
@@ -326,7 +348,7 @@
 		return note.trim();
 	}
 	
-	private String extractTrainNumber(Element trainTd) {
+	private String extractTrainNumberAzure(Element trainTd) {
 		Element anchorElement = trainTd.getElementsByTag("a").get(0);
 		String href = anchorElement.attr("href");
 		
@@ -336,6 +358,25 @@
 		return number;
 	}
 	
+	private String extractTrainNumberWww(Element trainTd) {
+		String number = "";
+		Element anchorElement = trainTd.getElementsByTag("a").get(0);
+		String href = anchorElement.attr("href");
+		String argstring = href.substring( href.indexOf('?') + 1);
+		
+		String args[] = argstring.split("&");
+		for (String arg : args) {
+			String pair[] = arg.split("="); // Key=pair[0], Value=pair[1]
+			
+			if (pair[0].equalsIgnoreCase("TogNr"))
+				number = pair[1];
+		}
+		
+		
+		return number;
+	}
+
+	
 	//test
 	/*
 	public static void main(String args[]) throws Exception {