--- 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/10/04 08:42:12	1160
@@ -1,83 +1,79 @@
 package dk.thoerup.traininfo.provider;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import org.simpleframework.xml.Serializer;
+import org.simpleframework.xml.core.Persister;
 
 import android.util.Log;
-import dk.thoerup.traininfo.TimetableBean;
+import dk.thoerup.android.traininfo.common.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;
+
+	AndroidTimeoutCache<String,TimetableBean> timetableCache = new AndroidTimeoutCache<String,TimetableBean>(CACHE_TIMEOUT);	
 
 	@Override
-	public List<TimetableBean> getTimetable() {
+	public TimetableBean lookupTimetable(String type, String trainID) {
+		
+		String trainNumber = extractTrainNumber(trainID);
+		
+		String key = type + "-" + trainID;
+		TimetableBean timetables = timetableCache.get(key);
+	
+		if (timetables == null) {			
+			timetables = lookupTimetableWorker(type, trainNumber);
+			
+			if (timetables != null) {			
+				timetableCache.put(key, timetables);
+			}
+			
+		} else {
+			Log.i("XmlTimetableProvider", "cache hit !!!");
+		}		
+		
 		return timetables;
 	}
+	
 
-	@Override
-	public boolean lookupTimetable(String trainID) {
-		boolean success = false;
-		String url = XmlUtil.SERVICE_BASE + "/TimetableServlet?train=" + trainID ;
+	public TimetableBean lookupTimetableWorker(String type, String trainNumber) {
+
+		String url = XmlUtil.SERVICE_BASE + "/TimetableServlet?train=" + trainNumber + "&type=" + type;
 		Log.i("url", url);
 		try {
-			timetables.clear();
 			
 			String xml = DownloadUtil.getContentString(url, 15000, "ISO-8859-1");
 			
+			Serializer serializer = new Persister();
+
+			TimetableBean timetables = serializer.read(TimetableBean.class, xml);
 			
-			Document doc = XmlUtil.parseXML(xml);
-			Node rootNode = doc.getDocumentElement(); // stations
-			NodeList stationList = rootNode.getChildNodes();
 			
-
-			for (int i=0; i<stationList.getLength(); i++) {
-				Node entryNode = stationList.item(i);
-				
-				if (! entryNode.getNodeName().equals("entry"))
-					continue;
-	
-				TimetableBean timetable = new TimetableBean();
-				
-				NodeList entries = entryNode.getChildNodes();
-				for (int j=0; j<entries.getLength(); j++) {	
-					Node current = entries.item(j);
-										
-					String content = null;
-					if (current.getFirstChild() != null) 
-						content = current.getFirstChild().getNodeValue(); //get the textNode - then get the text node's value
-					
-					String nodeName = current.getNodeName();
-					
-					if (nodeName.equals("station"))
-						timetable.setStation( content );						
-					
-					if (nodeName.equals("arrival"))
-						timetable.setArrival( content );
-					
-					if (nodeName.equals("departure"))
-						timetable.setDeparture( content );
-					
-					if (nodeName.equals("current"))
-						timetable.setCurrent( Boolean.parseBoolean(content) );
-
-				}
-				timetables.add(timetable);				
-			}
-			success = true;
+			return timetables;
 			
 			
 		} catch (Exception e) {
 			Log.e("XmlStationProvider", "lookupStations: ", e);
 		}
-		return success;
 
+		return null;
+	}
+	
+	private String extractTrainNumber (String trainID) {
+
+		String parts[]  = trainID.split(" ");
+		if (parts.length == 2) {
+			return parts[1];
+		} else {
+			return parts[0];
+		}
+	}
+	
+	@Override
+	public void purgeOldEntries() {
+		timetableCache.purgeOldEntries();		
 	}
 
 }