Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

'v3.9.4.1'

Browse Source
This commit is contained in:
gnosygnu
2016-09-25 22:05:47 -04:00
parent 35d78f6106
commit e3b393650d
211 changed files with 3148 additions and 2197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
140_dbs/src/gplx/dbs/Db_conn.java
View File

@@ -68,6 +68,7 @@ public class Db_conn {
}
public String Meta_fld_append_if_missing(String tbl_name, Dbmeta_fld_list flds, Dbmeta_fld_itm fld) {
String fld_name = fld.Name();
// if fld doesn't exist, add it; NOTE: need to check if tbl exists first else meta_fld not available
if ( this.Meta_tbl_exists(tbl_name)
&& !this.Meta_fld_exists(tbl_name, fld_name)) {
try {this.Meta_fld_append(tbl_name, fld);}
@@ -76,8 +77,11 @@ public class Db_conn {
fld_name = Dbmeta_fld_itm.Key_null;
}
}
else
fld_name = flds.Add(fld);
// if fld does exist, or tbl doesn't exist, just add fld to collection
else {
if (!flds.Has(fld.Name())) // NOTE: need to check if it already exists; DATE:2016-09-22
fld_name = flds.Add(fld);
}
return fld_name;
}
public Dbmeta_tbl_mgr Meta_mgr() {return engine.Meta_mgr();}

5
140_dbs/src/gplx/dbs/Db_conn_bldr.java
View File

@@ -45,5 +45,10 @@ public class Db_conn_bldr {
else throw Err_.new_("dbs", "db does not exist", "url", url.Raw());
}
}
public Db_conn Get_or_fail(Io_url url) {
Db_conn rv = Get(url);
if (rv == Db_conn_.Noop) throw Err_.new_wo_type("connection is null; file does not exist: file={0}", "file", url.Raw());
return rv;
}
public static final Db_conn_bldr Instance = new Db_conn_bldr(); Db_conn_bldr() {}
}