--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/20 06:35:13	1335
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/20 20:04:05	1366
@@ -16,6 +16,8 @@
 import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
+import dk.thoerup.genericjavautils.HttpUtil;
+import dk.thoerup.genericjavautils.TimeoutMap;
 import dk.thoerup.traininfoservice.Statistics;
 import dk.thoerup.traininfoservice.TraininfoSettings;
 import dk.thoerup.traininfoservice.db.StationDAO;
@@ -262,14 +264,20 @@
 		    	}
 		    	
 		    	
-		    	Element link = currentRow.child(0);	
+		    	String link = currentRow.child(0).attr("href");	
+		    	
 				logger.fine( currentRow.text() );
+				logger.fine("Href: " + link);
 		    	
 
 		    	String parts[] = currentRow.text().split(",");
 	    	
 
 		    	DepartureEntry departure = new DepartureEntry();
+		    	
+		    	//if we do these things upfront, then we are allowed to use continue statement when row contains no more data
+		    	departure.setType(typeString);
+		    	departureBean.entries.add( departure );
 
 /*
 http://mobil.bane.dk/mobilStation.asp?artikelID=5332&tognummer=111&webprofil=FJRN&mode=rute&strBemaerkning=Afg%E5r+fra+%C5rhus+H+kl%2E07%3A21++&strRefURL=%2FmobilStation%2Easp%3FartikelID%3D5332%26stat%5Fkode%3DAR%26webprofil%3DFJRN%26beskrivelse%3D%25C5rhus%2BH%26mode%3Dankomstafgang%26ankomstafgang%3Dafgang%26gemstation%3D
@@ -284,16 +292,17 @@
 		    	int updated = 4; //does not exist on mobile
 		    	departure.setUpdated(updated);
 
-		    	String trainNumber = "-"; //extractTrainNumberAzure(fields.get(2));
+		    	String trainNumber = extractTrainNumberMobile(link);
 		    	/*if (traintype == TrainType.STOG) //If it is S-train we need to extract the trainNumber 
 		    		trainNumber = trainNumber + " " + extractTrainNumberAzure(fields.get(2));*/
 		    	departure.setTrainNumber(trainNumber);
 
 				if (traintype == TrainType.STOG) { //if it is stog the next vield is the "Line" code - this should be used somewhere, but skippint ahead for now
-					offset++;
+					String stogLine = parts[offset++].trim();
+					departure.setTrainNumber(stogLine + " " + trainNumber);
 				}
 
-		    	String destination = parts[offset++];
+		    	String destination = parts[offset++].trim();;
 		    	departure.setDestination(destination);
 
 		    	String origin = "-"; // fields.get(4).text(); does not exist on mobile
@@ -301,17 +310,25 @@
 
 		    	String location = ""; // fields.get(5).text(); does not exist on mobile
 		    	departure.setLocation(location);
+		    	
+		    	if (offset == parts.length) {
+		    		continue;
+		    	}
+		    	
+		    	if (parts[offset].trim().equalsIgnoreCase("NB!")) {
+		    		offset++;
+		    	}
+		    	
+		    	if (offset == parts.length) {
+		    		continue;
+		    	}
 
-		    	String status = ""; //fields.get(6).text().trim(); - extract from url
+		    	String status = parts[offset++].trim();; //fields.get(6).text().trim(); - extract from url
 		    	departure.setStatus(status);
 
 		    	String note = ""; //extractNote( fields.get(7) ); - extract from url
 		    	departure.setNote(note);
 
-		    	departure.setType(typeString);
-
-		    	departureBean.entries.add( departure );
-
 		    }
 	    } else {
 	    	logger.warning("No departures found for station=" + stationcode + ", type=" + traintype);
@@ -461,20 +478,31 @@
 		return number;
 	}
 	
+	private String extractTrainNumberMobile(String link) {
+		Map<String,String> elements = HttpUtil.decodeParams(link);
+		
+		return elements.get("tognummer");
+	}
+	
 	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 argstring = href.split("?")[1];
+		Map<String,String> elements = HttpUtil.decodeParams(argstring);
+		number = elements.get("TogNr");		
+		
 		
+		/*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;
 	}