--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlTimetableProvider.java	2009/09/29 19:06:34	357
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlTimetableProvider.java	2010/05/03 11:19:18	699
@@ -4,30 +4,67 @@
 import java.util.List;
 
 import org.w3c.dom.Document;
+
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import android.util.Log;
 import dk.thoerup.traininfo.TimetableBean;
+import dk.thoerup.traininfo.util.AndroidTimeoutCache;
 import dk.thoerup.traininfo.util.DownloadUtil;
 import dk.thoerup.traininfo.util.XmlUtil;
 
 public class XmlTimetableProvider implements TimetableProvider {
 	
-	List<TimetableBean> timetables = new ArrayList<TimetableBean>();
+	final static int CACHE_TIMEOUT = 60*1000;
+	
+	List<TimetableBean> timetables;
 
+	AndroidTimeoutCache<String,List<TimetableBean>> departureCache = new AndroidTimeoutCache<String,List<TimetableBean>>(CACHE_TIMEOUT);
+	
 	@Override
-	public List<TimetableBean> getTimetable() {
-		return timetables;
+	public List<TimetableBean> getTimetable(String type, String trainID) {
+		String key = type + "-" + trainID;
+		List<TimetableBean> list = departureCache.get(key);
+		
+		if (list == null) {			
+			list = new ArrayList<TimetableBean>();
+		} 
+		
+		return list;
 	}
 
 	@Override
-	public boolean lookupTimetable(String trainID) {
+	public boolean lookupTimetable(String type, String trainID) {
+		boolean success;
+		
+		String trainNumber = extractTrainNumber(trainID);
+		
+		String key = type + "-" + trainID;
+		timetables = departureCache.get(key);
+	
+		if (timetables == null) {			
+			success = lookupTimetableWorker(type, trainNumber);
+			
+			if (success) {			
+				departureCache.put(key, timetables);
+			}
+			
+		} else {
+			Log.i("XmlTimetableProvider", "cache hit !!!");
+			success = true;
+		}		
+		
+		return success;
+	}
+	
+
+	public boolean lookupTimetableWorker(String type, String trainNumber) {
 		boolean success = false;
-		String url = XmlUtil.SERVICE_BASE + "/TimetableServlet?train=" + trainID ;
+		String url = XmlUtil.SERVICE_BASE + "/TimetableServlet?train=" + trainNumber + "&type=" + type;
 		Log.i("url", url);
 		try {
-			timetables.clear();
+			timetables = new ArrayList<TimetableBean>();
 			
 			String xml = DownloadUtil.getContentString(url, 15000, "ISO-8859-1");
 			
@@ -45,7 +82,14 @@
 	
 				TimetableBean timetable = new TimetableBean();
 				
-				NodeList entries = entryNode.getChildNodes();
+				NodeList entries = entryNode.getChildNodes();				
+				
+				if (entryNode.hasAttributes() && entryNode.getAttributes().getNamedItem("current") != null) {					
+					timetable.setCurrent( Boolean.parseBoolean(entryNode.getAttributes().getNamedItem("current").getNodeValue()));
+				} else {
+					timetable.setCurrent(false);
+				}
+				
 				for (int j=0; j<entries.getLength(); j++) {	
 					Node current = entries.item(j);
 										
@@ -64,8 +108,8 @@
 					if (nodeName.equals("departure"))
 						timetable.setDeparture( content );
 					
-					if (nodeName.equals("current"))
-						timetable.setCurrent( Boolean.parseBoolean(content) );
+					/*if (nodeName.equals("current"))
+						timetable.setCurrent( Boolean.parseBoolean(content) );*/
 
 				}
 				timetables.add(timetable);				
@@ -76,8 +120,19 @@
 		} catch (Exception e) {
 			Log.e("XmlStationProvider", "lookupStations: ", e);
 		}
+
 		return success;
 
 	}
+	
+	private String extractTrainNumber (String trainID) {
+
+		String parts[]  = trainID.split(" ");
+		if (parts.length == 2) {
+			return parts[1];
+		} else {
+			return parts[0];
+		}
+	}
 
 }