package net.ktnx.mobileledger;
import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
import java.io.BufferedReader;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDatabase, Integer, Void> {
+import static net.ktnx.mobileledger.MobileLedgerDB.db;
+
+abstract public class RetrieveAccountsTask extends android.os.AsyncTask<Void, Integer, Void> {
int error;
private SharedPreferences pref;
error = 0;
}
- protected Void doInBackground(SQLiteDatabase... sqLiteDatabases) {
- final SQLiteDatabase db = sqLiteDatabases[0];
+ protected Void doInBackground(Void... params) {
try {
HttpURLConnection http = NetworkUtil.prepare_connection( pref, "add");
http.setAllowUserInteraction(false);
throw new IOException(String.valueOf(R.string.err_http_error));
}
else {
+ if (db.inTransaction()) throw new AssertionError();
+
db.beginTransaction();
- db.execSQL("delete from account_values;");
- db.execSQL("delete from accounts;");
try {
+ db.execSQL("update account_values set keep=0;");
+ db.execSQL("update accounts set keep=0;");
+
String line;
String last_account_name = null;
BufferedReader buf = new BufferedReader(new InputStreamReader(resp, "UTF-8"));
// %3A is '='
Pattern re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
- Pattern value_re = Pattern.compile("<span class=\"[^\"]*\\bamount\\b[^\"]*\">([\\d.,]+)(?:\\s+(\\S+))?</span>");
+ Pattern value_re = Pattern.compile("<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
+ Pattern tr_re = Pattern.compile("</tr>");
int count = 0;
while ((line = buf.readLine()) != null) {
Matcher m = re.matcher(line);
- while (m.find()) {
+ if (m.find()) {
String acct_encoded = m.group(1);
String acct_name = URLDecoder.decode(acct_encoded, "UTF-8");
acct_name = acct_name.replace("\"", "");
Log.d("account-parser", acct_name);
- db.execSQL("insert into accounts(name) values(?)", new Object[]{acct_name} );
+ db.execSQL("insert or replace into accounts(name, keep) values(?, 1)", new Object[]{acct_name} );
publishProgress(++count);
last_account_name = acct_name;
+
+ continue;
+ }
+
+ Matcher tr_m = tr_re.matcher(line);
+ if (tr_m.find()) {
+ last_account_name = null;
+ continue;
}
if (last_account_name == null) continue;
if(currency == null) currency="";
value = value.replace(',', '.');
Log.d("db", "curr="+currency+", value="+value);
- db.execSQL("insert into account_values(account, currency, value) values(?, ?, ?);",
+ db.execSQL("insert or replace into account_values(account, currency, value, keep) values(?, ?, ?, 1);",
new Object[]{last_account_name, currency, Float.valueOf(value)});
}
}
+ db.execSQL("delete from account_values where keep=0;");
+ db.execSQL("delete from accounts where keep=0;");
db.setTransactionSuccessful();
}
finally {