--- android/TrainInfoService/src/dk/thoerup/traininfoservice/db/StationDAO.java	2011/06/08 19:11:36	1512
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/db/StationDAO.java	2011/07/09 17:18:59	1574
@@ -6,6 +6,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.logging.Logger;
 
 import dk.thoerup.android.traininfo.common.StationBean;
@@ -145,12 +147,25 @@
 		return stations;
 	}
 	
-	public StationBean getByName(final String name) throws SQLException {
+	private String removeSuffix(String str, String suffix) {
+		if (str.endsWith(suffix)) {
+			return str.substring(0, str.length() - suffix.length() );
+		} else {
+			return str;
+		}
+	}
+	
+	public StationBean getByName(String name) throws SQLException {
+		name = removeSuffix(name, " st.");
+		name = removeSuffix(name, " st");
+		name = removeSuffix(name, " station");
+		
 		StationBean stations = getByNameNormal(name);
 		
 		if (stations.entries.size() == 0) {
-			logger.info("getByName failover: " + name);
 			stations = getByNameFuzzy(name);
+
+			logger.info("getByName failover: " + name + "(" + (stations.entries.size() >0) + ")" );
 		}
 		return stations;
 	}
@@ -244,12 +259,19 @@
 		}
 	}
 	
+	Comparator<StationEntry> nameComparator = new Comparator<StationEntry>() {
+		@Override
+		public int compare(StationEntry arg0, StationEntry arg1) {
+			return arg0.getName().compareTo( arg1.getName() );
+		}		
+	};
+	
 	//used to create full dump in order to populate Google Appengine DB
-	@Deprecated
+	//after 1.1.0 also used to populate client-side station list
 	public StationBean dumpAll() throws SQLException {
 		
 		String SQL = "SELECT id,name,latitude,longitude,stationcode_fjrn,stationcode_stog,stationcode_metro,address,0.0,aliases " +
-				"FROM trainstations WHERE enabled = true ORDER BY id";
+				"FROM trainstations WHERE enabled = true";
 		
 		Connection conn = null;
 		Statement stmt = null;
@@ -276,6 +298,7 @@
 				stations.entries.add( entry );
 				
 			}
+			Collections.sort( stations.entries,nameComparator );
 			return stations;