--- android/TrainInfoService/src/dk/thoerup/traininfoservice/db/StationDAO.java	2011/06/08 15:38:11	1504
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/db/StationDAO.java	2011/06/08 19:11:36	1512
@@ -97,49 +97,7 @@
 		}
 	}
 	
-	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";
-		
-		Connection conn = null;
-		Statement stmt = null;
-		ResultSet res = null;		
-
-		
-		try {
-			conn = DBConnection.getConnection();
-
-			stmt = conn.createStatement();
-			res = stmt.executeQuery(SQL);		
-						
-			// Does mostly the same as convertResultset()
-			StationBean stations = new StationBean();
-			while (res.next()) {
-				StationEntry entry = convertSingleRow(res);
-				
-				Array arr = res.getArray(10);
-				if (arr != null) {
-					String[] aliases = (String[]) arr.getArray();
-					entry.setAliases(aliases);
-				}
-				
-				stations.entries.add( entry );
-				
-			}
-			return stations;
-			
 
-		} finally {
-			if (res != null)
-				res.close();
-			if (stmt != null)
-				stmt.close();
-			if (conn != null)
-				conn.close();
-		}
-		
-	}
 
 	/*
 	 * this code requires theses statements are run on database in order to do ILIKE searches against aliases (which is defines as array of varchar(64) )
@@ -147,7 +105,7 @@
 	 *     'select $2 ilike $1' language sql strict immutable;
 	 *     create operator ~~~ (procedure = rlike, leftarg = text, rightarg = text, commutator = ~~);
 	 */
-	public StationBean getByName(final String name) throws SQLException {
+	public StationBean getByNameNormal(final String name) throws SQLException {
 		String SQL = "SELECT id,name,latitude,longitude,stationcode_fjrn,stationcode_stog, stationcode_metro, address, 0.0 " + 
 		"FROM trainstations " + 
 		"WHERE (name ILIKE ? OR ? ~~~ ANY(aliases)) AND enabled = true " +
@@ -163,11 +121,48 @@
 		
 		return fetchStations(SQL, new NameSetter() );
 	}
+	
+	
+	public StationBean getByNameFuzzy(final String name) throws SQLException {
+		String SQL = "SELECT * FROM (" +
+					 "    SELECT id,name,latitude,longitude,stationcode_fjrn,stationcode_stog, stationcode_metro, address, 0.0, " +
+					 "    levenshtein(lower(name),lower(?) ) as leven " +
+					 "    FROM trainstations " +
+					 "    WHERE  enabled = true ) as lev2 " +
+					 "WHERE (leven <= 3) " +		
+					 "ORDER BY leven " + 
+					 "LIMIT 1";
+
+		class NameSetter implements StatementParamSetter {
+			@Override
+			public void setParams(PreparedStatement stmt) throws SQLException {
+				stmt.setString(1, name );
+			}			
+		}
+		
+		StationBean stations = fetchStations(SQL, new NameSetter() );
+		stations.fuzzystrmatch = true;
+		return stations;
+	}
+	
+	public StationBean getByName(final String name) throws SQLException {
+		StationBean stations = getByNameNormal(name);
+		
+		if (stations.entries.size() == 0) {
+			logger.info("getByName failover: " + name);
+			stations = getByNameFuzzy(name);
+		}
+		return stations;
+	}
+	
+	
 
 	//Latitude (horizonal), longitude(vertical) so
 	// 1 degree latitude is ~ 111320 meters, since the distance between the horizonal lines is always the same 
 	// 1 degree longitude is ~111320 meters at equator but gets shorter as we get closer to the poles.
-	// the "hack" with max 0.4 degrees latitude and 0.75 degrees longitude is only valid since we only service danish trains,
+	// so 1 degree longitude is 64.5 km at denmarks southern point (gedser=54.55,11.95)
+	// and is 59.4km at northern point (skagen = 57.75,10.65)
+	// The "hack" with max 0.4 degrees latitude and 0.75 degrees longitude is only valid since we only service danish trains,
 	// in denmark 0.4dg latitude ~ 44km, 0.75dg longitude ~ 47km
 
 	// the ultra fast method  (and only slightly inaccurate as long as we only cover a limited geographically area)
@@ -248,6 +243,52 @@
 			return null;
 		}
 	}
+	
+	//used to create full dump in order to populate Google Appengine DB
+	@Deprecated
+	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";
+		
+		Connection conn = null;
+		Statement stmt = null;
+		ResultSet res = null;		
+
+		
+		try {
+			conn = DBConnection.getConnection();
+
+			stmt = conn.createStatement();
+			res = stmt.executeQuery(SQL);		
+						
+			// Does mostly the same as convertResultset()
+			StationBean stations = new StationBean();
+			while (res.next()) {
+				StationEntry entry = convertSingleRow(res);
+				
+				Array arr = res.getArray(10);
+				if (arr != null) {
+					String[] aliases = (String[]) arr.getArray();
+					entry.setAliases(aliases);
+				}
+				
+				stations.entries.add( entry );
+				
+			}
+			return stations;
+			
+
+		} finally {
+			if (res != null)
+				res.close();
+			if (stmt != null)
+				stmt.close();
+			if (conn != null)
+				conn.close();
+		}
+		
+	}
 
 	@Deprecated
 	public static String getStationName(int stationID) {