--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlTimetableProvider.java	2010/09/16 15:31:31	1065
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlTimetableProvider.java	2010/09/16 15:32:42	1066
@@ -1,15 +1,10 @@
 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;
@@ -18,15 +13,15 @@
 	
 	final static int CACHE_TIMEOUT = 60*1000;
 
-	AndroidTimeoutCache<String,List<TimetableBean>> timetableCache = new AndroidTimeoutCache<String,List<TimetableBean>>(CACHE_TIMEOUT);	
+	AndroidTimeoutCache<String,TimetableBean> timetableCache = new AndroidTimeoutCache<String,TimetableBean>(CACHE_TIMEOUT);	
 
 	@Override
-	public List<TimetableBean> lookupTimetable(String type, String trainID) {
+	public TimetableBean lookupTimetable(String type, String trainID) {
 		
 		String trainNumber = extractTrainNumber(trainID);
 		
 		String key = type + "-" + trainID;
-		List<TimetableBean> timetables = timetableCache.get(key);
+		TimetableBean timetables = timetableCache.get(key);
 	
 		if (timetables == null) {			
 			timetables = lookupTimetableWorker(type, trainNumber);
@@ -43,64 +38,19 @@
 	}
 	
 
-	public List<TimetableBean> lookupTimetableWorker(String type, String trainNumber) {
+	public TimetableBean lookupTimetableWorker(String type, String trainNumber) {
 
 		String url = XmlUtil.SERVICE_BASE + "/TimetableServlet?train=" + trainNumber + "&type=" + type;
 		Log.i("url", url);
 		try {
-			List<TimetableBean> timetables = new ArrayList<TimetableBean>();
 			
 			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();				
-				
-				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);
-										
-					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("stationid"))
-						timetable.setStationId( Integer.parseInt(content));
-					
-					/*if (nodeName.equals("current"))
-						timetable.setCurrent( Boolean.parseBoolean(content) );*/
-
-				}
-				timetables.add(timetable);				
-			}
 			return timetables;