--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlDepartureProvider.java	2009/08/08 20:09:47	238
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlDepartureProvider.java	2010/10/04 08:42:12	1160
@@ -1,95 +1,73 @@
 package dk.thoerup.traininfo.provider;
 
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
+
+
+import org.simpleframework.xml.Serializer;
+import org.simpleframework.xml.core.Persister;
+
 
 import android.util.Log;
-import dk.thoerup.traininfo.DepartureBean;
+import dk.thoerup.android.traininfo.common.DepartureBean;
+import dk.thoerup.traininfo.util.AndroidTimeoutCache;
 import dk.thoerup.traininfo.util.DownloadUtil;
+import dk.thoerup.traininfo.util.XmlUtil;
 
-public class XmlDepartureProvider extends DefaultHandler implements DepartureProvider {
+public class XmlDepartureProvider implements DepartureProvider {
 
-	ArrayList<DepartureBean> departures = new ArrayList<DepartureBean>();
+	final static int CACHE_TIMEOUT = 60*1000;
+		
 	
+	AndroidTimeoutCache<String,DepartureBean> departureCache = new AndroidTimeoutCache<String,DepartureBean>(CACHE_TIMEOUT); 
 	
-	DepartureBean tempDeparture;
-	StringBuilder builder = new StringBuilder(512);
+		
 	
 	@Override
-	public void lookupDepartures(String station) {
-		departures.clear();
-		try
-		{	String url = "http://t-hoerup.dk/tog/xml_display.php?stationname="+station;
-			String doc =  DownloadUtil.getContent(url, 30000, "ISO-8859-1");
+	public DepartureBean lookupDepartures(int stationID, boolean arrival) {		
+		
+		String key = "" + stationID + ":" + arrival;
+		
+		DepartureBean departures = departureCache.get(key);
+	
+		if (departures == null) {			
+			departures = lookupDeparturesWorker(stationID, arrival);
 			
-			InputSource source = new InputSource( new StringReader(doc));
+			if (departures != null) {			
+				departureCache.put(key, departures);
+			}
 			
-			SAXParserFactory spf = SAXParserFactory.newInstance();
-            SAXParser sp = spf.newSAXParser();
-            XMLReader xr = sp.getXMLReader();
-
-			xr.setContentHandler(this);
-			xr.setErrorHandler(this);
-			xr.setDTDHandler(this);
-			xr.parse(source);
-		} catch (Exception e) {
-			Log.e("XmlDepartureProvider", "looupFunction", e);
-		}
-	}
-	
-	@Override
-	public List<DepartureBean> getDepartures() {
+		} else {
+			Log.i("XmlDepartureProvider", "cache hit !!!");
+		}		
+		
 		return departures;
 	}
 	
-	// this can be called several times fore the same text-node if there are many chardata / lines
-	@Override
-	public void characters (char ch[], int start, int length) 
-	{		
-		for (int i= start; i<start+length; i++)
-			builder.append(ch[i]);	
+	private DepartureBean lookupDeparturesWorker(int stationID, boolean arrival) {
+
+		try
+		{	
+			int iArrival = arrival ? 1 : 0;
+			String url = XmlUtil.SERVICE_BASE + "/DepartureServlet?format=xml&station=" + stationID + "&arrival=" + iArrival;
+			Log.i("xmlurl",url);
+			String doc =  DownloadUtil.getContentString(url, 30000, "ISO-8859-1");
+
+			Serializer serializer = new Persister();
+
+			DepartureBean departures = serializer.read(DepartureBean.class, doc);
+			
+			
+			return departures;
+			
+			
+		} catch (Exception e) {
+			Log.e("XmlDepartureProvider", "looupFunction", e);
+			return null;
+		}		
 	}
-	
+
 	@Override
-	public void startElement (String uri, String name, String qName, Attributes atts)throws SAXException
-	{
-		if (name.equalsIgnoreCase("train"))
-			tempDeparture = new DepartureBean();
-		
-		builder.setLength(0); //reset StringBuilder
+	public void purgeOldEntries() {
+		departureCache.purgeOldEntries();		
 	}
 	
-	@Override
-	public void endElement (String uri, String name, String qName) throws SAXException
-	{
-		if (name.equals("train")) {
-			departures.add( tempDeparture );
-		} else if (name.equals("time")) {
-			tempDeparture.setTime(builder.toString());
-		} else if (name.equals("updated")) {
-			tempDeparture.setLastUpdate(builder.toString());
-		} else if (name.equals("trainnumber")) {
-			tempDeparture.setTrainNumber(builder.toString());
-		} else if (name.equals("destination")) {
-			tempDeparture.setDestination(builder.toString());
-		} else if (name.equals("origin")) {
-			tempDeparture.setOrigin(builder.toString());
-		} else if (name.equals("location")) {
-			tempDeparture.setLocation(builder.toString());
-		} else if (name.equals("status")) {
-			tempDeparture.setStatus(builder.toString());
-		} else if (name.equals("note")) {
-			tempDeparture.setNote(builder.toString());
-		} 
-	}
 }