1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

v2.10.3.1

This commit is contained in:
gnosygnu
2015-10-18 22:17:57 -04:00
parent 8e18af05b6
commit 4f43f51b18
1935 changed files with 12500 additions and 12889 deletions

View File

@@ -50,9 +50,9 @@ public class Db_cmd_backup implements GfoInvkAble {
this.InitVars();
Io_url bkpCmdFil = bkpDir.GenSubFil_ary("backup_", dbName, ".cmd");
// Io_url bkpCmdFil = Io_url_.new_dir_("/home/").GenSubFil_ary("backup_", dbName, ".cmd"); // LNX: uncomment
Io_mgr.I.SaveFilStr_args(bkpCmdFil, cmdText).Exec(); // explicitly state utf8;
Io_mgr.Instance.SaveFilStr_args(bkpCmdFil, cmdText).Exec(); // explicitly state utf8;
ProcessAdp.run_wait_(bkpCmdFil);
Io_mgr.I.DeleteFil(bkpCmdFil);
Io_mgr.Instance.DeleteFil(bkpCmdFil);
return this;
}
@gplx.Internal protected Db_cmd_backup InitVars() {

View File

@@ -24,7 +24,7 @@ public abstract class Db_in_wkr__base {
@gplx.Virtual protected boolean Show_progress() {return false;}
public void Select_in(Cancelable cancelable, Db_conn conn, int full_bgn, int full_end) {
int part_len = Interval();
Gfo_usr_dlg usr_dlg = Gfo_usr_dlg_.I;
Gfo_usr_dlg usr_dlg = Gfo_usr_dlg_.Instance;
boolean show_progress = this.Show_progress();
for (int part_bgn = full_bgn; part_bgn < full_end; part_bgn += part_len) {
int part_end = part_bgn + part_len;

View File

@@ -32,9 +32,9 @@ public class PoolIds {
return rv;
}
public int FetchNextAndCommit(String dbInfo, String url) {
Db_conn conn = Db_conn_pool.I.Get_or_new(dbInfo);
int rv = PoolIds._.FetchNext(conn, url);
PoolIds._.Commit(conn, url, rv + 1);
Db_conn conn = Db_conn_pool.Instance.Get_or_new(dbInfo);
int rv = PoolIds.Instance.FetchNext(conn, url);
PoolIds.Instance.Commit(conn, url, rv + 1);
return rv;
}
public void Commit(Db_conn conn, String url, int val) {
@@ -47,5 +47,5 @@ public class PoolIds {
public static final String Tbl_Name = "pool_ids";
@gplx.Internal protected static final String Fld_id_path = "id_path";
@gplx.Internal protected static final String Fld_id_next_id = "id_next_id";
public static final PoolIds _ = new PoolIds(); PoolIds() {}
public static final PoolIds Instance = new PoolIds(); PoolIds() {}
}

View File

@@ -19,9 +19,9 @@ package gplx.dbs.utls; import gplx.*; import gplx.dbs.*;
import org.junit.*;
public class PoolIds_tst {
@Before public void setup() {
conn = Db_conn_pool.I.Get_or_new(Db_conn_info_.Test);
conn = Db_conn_pool.Instance.Get_or_new(Db_conn_info_.Test);
Db_qry_fxt.DeleteAll(conn, PoolIds.Tbl_Name);
mgr = PoolIds._;
mgr = PoolIds.Instance;
}
@Test public void FetchNextId() {
tst_Fetch("/test0", 0);