--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/03/31 17:13:19	1248
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/20 05:20:43	1330
@@ -16,8 +16,9 @@
 import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
+import dk.thoerup.traininfoservice.TraininfoSettings;
+import dk.thoerup.traininfoservice.db.StationDAO;
 
 public class DepartureFetcher {
 	
@@ -38,13 +39,12 @@
 	
 	StationDAO stationDao = new StationDAO();
 	
-	private boolean useAzureSite;
-	private int replyTimeout;
+
+	private TraininfoSettings settings;
 	
-	public DepartureFetcher(boolean azureSite, int cacheTimeout, int replyTimeout) {
-		this.replyTimeout = replyTimeout;
-		useAzureSite = azureSite;
-		cache = new TimeoutMap<String,DepartureBean>(cacheTimeout);
+	public DepartureFetcher(TraininfoSettings settings) {
+		this.settings = settings;
+		cache = new TimeoutMap<String,DepartureBean>( settings.getCacheTimeout() );
 	}
 	
 	
@@ -75,7 +75,7 @@
 		StationEntry station = stationDao.getById(stationID);
 		
 		departureBean.stationName = station.getName();
-		
+
 		if (station.getRegional() != null && (type == FetchTrainType.REGIONAL||type == FetchTrainType.BOTH) ) {
 			DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
 			departureBean.entries.addAll( tempBean.entries );
@@ -92,17 +92,19 @@
 			logger.info("No departures found for station " + stationID);
 		}
 		
-		Collections.sort( departureBean.entries );
+		if (type == FetchTrainType.BOTH) { //if we have both S-tog and regional order by departure/arrival time 
+			Collections.sort( departureBean.entries );
+		}
 
 		
 		return departureBean;
 	}
 	
 	public DepartureBean lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception {
-		if (useAzureSite == true) {
+		if ( settings.getUseAzureSite() == true) {
 			return lookupDeparturesAzureSite(stationcode, type, arrival);
 		} else { 
-			return lookupDeparturesWwwSite(stationcode, type, arrival);
+			return lookupDeparturesMobileSite(stationcode, type, arrival);
 		}
 	}
 	
@@ -141,7 +143,7 @@
 	    String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";	    
 	    
 	    logger.fine("URI: " + uri);	    
-	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout);
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() );
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    Document page = (Document) breaker.invoke(wrapper);
@@ -227,6 +229,93 @@
 	    return departureBean;
 	}
 	
+	public DepartureBean lookupDeparturesMobileSite(String stationcode, TrainType traintype, boolean arrival) throws Exception {
+		
+		DepartureBean departureBean = new DepartureBean();
+		 
+	    
+		String typeString = getTypeStringWww(traintype);
+	    String arrivalDeparture = (arrival==false) ? "afgang" : "ankomst"; 
+	    
+	    stationcode = URLEncoder.encode(stationcode,"ISO-8859-1");
+
+	    //String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";	    
+	    String uri = "http://mobil.bane.dk/mobilStation.asp?artikelID=5332&stat_kode=" + stationcode + "&webprofil=" + typeString  +"&beskrivelse=&mode=ankomstafgang&ankomstafgang=" + arrivalDeparture + "&gemstation=&fuldvisning=1";
+	    logger.fine("URI: " + uri);	    
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() );
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
+	    
+	    Document page = (Document) breaker.invoke(wrapper);
+	    
+	    
+	    Element content = page.getElementsByClass("contentDiv").get(0);
+	    
+	    
+	    if (content != null) {
+		    Elements tableRows =  content.child(0).children();
+		    
+
+		    
+		    for (Element currentRow : tableRows) {
+		    	if (currentRow.tagName().equals("br") ) {
+		    		break;
+		    	}
+		    	
+		    	
+		    	Element link = currentRow.child(0);	
+		    	System.out.println( currentRow.text() );;
+		    	
+
+		    	String parts[] = currentRow.text().split(",");
+	    	
+
+		    	DepartureEntry departure = new DepartureEntry();
+
+/*
+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
+*/
+		    	int offset = 0;
+		    	
+		    	String time = parts[offset++];
+		    	if (time.equals(""))
+		    		time = "0:00"; //Bane.dk bug work-around
+		    	departure.setTime(time);
+
+		    	int updated = 4; //does not exist on mobile
+		    	departure.setUpdated(updated);
+
+		    	String trainNumber = "-"; //extractTrainNumberAzure(fields.get(2));
+		    	/*if (traintype == TrainType.STOG) //If it is S-train we need to extract the trainNumber 
+		    		trainNumber = trainNumber + " " + extractTrainNumberAzure(fields.get(2));*/
+		    	departure.setTrainNumber(trainNumber);
+
+		    	String destination = parts[offset++];
+		    	departure.setDestination(destination);
+
+		    	String origin = ""; // fields.get(4).text(); does not exist on mobile
+		    	departure.setOrigin(origin);
+
+		    	String location = ""; // fields.get(5).text(); does not exist on mobile
+		    	departure.setLocation(location);
+
+		    	String status = ""; //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);
+	    }
+	    
+	    return departureBean;
+	}
+	
 	
 	
 	public static String cleanText(String input) {
@@ -234,6 +323,9 @@
 		return input.replace((char) 0xA0, (char)0x20).trim();
 	}
 	
+	
+	// old www site is not available any more
+	@Deprecated
 	public DepartureBean lookupDeparturesWwwSite(String stationcode, TrainType trainType, boolean arrival) throws Exception {
 		
 		DepartureBean departureBean = new DepartureBean();
@@ -247,7 +339,7 @@
 	    logger.fine("URI:" + uri);
 	    
 
-	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); 
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() ); 
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    Element page = (Element) breaker.invoke(wrapper);