--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2010/09/16 09:11:23	1059
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2010/09/16 13:32:10	1060
@@ -1,7 +1,8 @@
 package dk.thoerup.traininfoservice.banedk;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.List;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -11,6 +12,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.simpleframework.xml.Serializer;
+import org.simpleframework.xml.core.Persister;
+
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
 import dk.thoerup.traininfoservice.Statistics;
 
@@ -55,7 +59,7 @@
 				
 		try
 		{
-			List<TimetableBean> timetable = fetcher.cachedLookupTimetable(train, type);
+			TimetableBean timetable = fetcher.cachedLookupTimetable(train, type);
 		
 			String responseXML = formatTimetable(timetable);
 		
@@ -77,29 +81,18 @@
 		
 	}
 	
-	String formatTimetable(List<TimetableBean> timetable) {
-		StringBuffer sb = new StringBuffer();
-		//sb.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n");
-		
-		sb.append("<timetable>");
-		
-		for (TimetableBean bean : timetable) {
-			sb.append("<entry");
-			if (bean.isCurrent())
-				sb.append(" current=\"true\"");
-			sb.append(">");
-			
-			sb.append("<station>").append( bean.getStation() ).append("</station>");
-			sb.append("<arrival>").append( bean.getArrival() ).append("</arrival>");
-			sb.append("<departure>").append( bean.getDeparture() ).append("</departure>");
-			sb.append("<stationid>").append( bean.getStationId() ).append("</stationid>");
-			//sb.append("<cancelled>").append( bean.isCancelled() ).append("</cancelled>");
-			sb.append("</entry>");
+	String formatTimetable(TimetableBean timetable) throws ServletException {
+		Serializer serializer = new Persister();
+
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+		try {
+			serializer.write(timetable, out);
+		} catch (Exception e) {
+			throw new ServletException(e);
 		}
 		
-		sb.append("</timetable>");
-		
-		return sb.toString();
+		return out.toString();
 	}
 
 }