import android.util.Log;
import java.io.BufferedReader;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
Pattern value_re = Pattern.compile("<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
Pattern tr_re = Pattern.compile("</tr>");
- Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\b");
+ Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\s*=\\s*new\\b");
Pattern description_items_re = Pattern.compile("\"value\":\"([^\"]+)\"");
int count = 0;
while ((line = buf.readLine()) != null) {
acct_name = acct_name.replace("\"", "");
Log.d("account-parser", acct_name);
- db.execSQL("insert or replace into accounts(name, keep) values(?, 1)", new Object[]{acct_name} );
+ db.execSQL("insert or replace into accounts(name, name_upper, " +
+ "keep) values(?, ?, 1)",
+ new Object[]{acct_name, acct_name.toUpperCase()});
publishProgress(++count);
last_account_name = acct_name;
if (description.isEmpty()) continue;
Log.d("db", String.format("Stored description: %s", description));
- db.execSQL("insert or replace into description_history(description, keep) values(?, 1);", new Object[]{description});
+ db.execSQL("insert or replace into description_history" +
+ "(description, description_upper, keep) " +
+ "values(?, ?, 1);",
+ new Object[]{description, description.toUpperCase()});
}
}
}
db.execSQL("delete from account_values where keep=0;");
db.execSQL("delete from accounts where keep=0;");
- db.execSQL("delete from description_history where keep=0;");
+// db.execSQL("delete from description_history where keep=0;");
db.setTransactionSuccessful();
}
finally {
} catch (MalformedURLException e) {
error = R.string.err_bad_backend_url;
e.printStackTrace();
- } catch (IOException e) {
+ }
+ catch (FileNotFoundException e) {
+ error = R.string.err_bad_auth;
+ e.printStackTrace();
+ }
+ catch (IOException e) {
error = R.string.err_net_io_error;
e.printStackTrace();
}