From 99c968e1e25f1dbff0c11e90d7f4d89a219a2292 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Thu, 26 Jan 2017 01:00:21 -0500 Subject: [PATCH] Mass_parse: Update wkr_id in resume cmd --- .../makes/Xomp_make_merger__lnki_temp.java | 1 + .../mass_parses/resumes/Xomp_resume_mgr.java | 15 ++++++++------- 400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java | 10 +++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_merger__lnki_temp.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_merger__lnki_temp.java index e532a4a80..eb6fee3d1 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_merger__lnki_temp.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_merger__lnki_temp.java @@ -23,6 +23,7 @@ class Xomp_make_merger__lnki_temp extends Xomp_make_merger__base { private Xob_lnki_temp_tbl trg_tbl__lnki_temp; @Override protected Db_tbl Init__trg_tbl(Xob_db_file trg_db) { this.trg_tbl__lnki_temp = new Xob_lnki_temp_tbl(trg_db.Conn()); + trg_db.Conn().Meta_tbl_remake(trg_tbl__lnki_temp); return trg_tbl__lnki_temp; } @Override protected String Init__src_fld__page_id() {return "lnki_page_id";} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/resumes/Xomp_resume_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/resumes/Xomp_resume_mgr.java index c1c86c7e7..29cf2e6e8 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/resumes/Xomp_resume_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/resumes/Xomp_resume_mgr.java @@ -26,21 +26,22 @@ class Xomp_resume_mgr { // clear out page_status Gfo_usr_dlg_.Instance.Prog_many("", "", "xomp_resume:clearing status"); - mgr_conn.Exec_sql("UPDATE xomp_page SET page_status = 0"); + mgr_conn.Exec_sql("UPDATE xomp_page SET page_status = 0, xomp_wkr_id = -1"); // update mgr.xomp_page.status for each row in wkr.html Db_attach_mgr attach_mgr = new Db_attach_mgr(mgr_conn); int wkrs_len = mgr_db.Tbl__wkr().Select_count(); - String sql = Db_sql_.Make_by_fmt - ( String_.Ary - ( "UPDATE xomp_page" - , "SET page_status = 1" - , "WHERE page_id IN (SELECT page_id FROM html)" - )); for (int i = 0; i < wkrs_len; ++i) { Gfo_usr_dlg_.Instance.Prog_many("", "", "xomp_resume:updating status; wkr=~{0}", i); Xomp_wkr_db wkr_db = Xomp_wkr_db.New(mgr_db.Dir(), i); attach_mgr.Conn_links_(new Db_attach_itm("wkr_db", wkr_db.Conn())); + String sql = Db_sql_.Make_by_fmt + ( String_.Ary + ( "UPDATE xomp_page" + , "SET page_status = 1" + , ", xomp_wkr_id = {0}" + , "WHERE page_id IN (SELECT page_id FROM html)" + ), i); attach_mgr.Exec_sql(sql); } } diff --git a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java index 92bdba95f..d16099eb5 100644 --- a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java +++ b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java @@ -43,7 +43,7 @@ public class Xof_xfer_itm implements Xof_file_itm { public int Lnki_h() {return lnki_h;} private int lnki_h; public double Lnki_time() {return lnki_time;} private double lnki_time; public int Lnki_page() {return lnki_page;} private int lnki_page; - public boolean Orig_exists() {return orig_exists;} private boolean orig_exists; + public boolean Orig_exists() {return orig_exists;} private boolean orig_exists; public byte Orig_repo_id() {return orig_repo_id;} private byte orig_repo_id; public byte[] Orig_repo_name() {return orig_repo_name;} private byte[] orig_repo_name; public byte[] Orig_ttl() {return orig_ttl;} private byte[] orig_ttl; @@ -53,7 +53,7 @@ public class Xof_xfer_itm implements Xof_file_itm { public int Orig_h() {return orig_h;} private int orig_h; public byte[] Orig_redirect() {return orig_redirect;} private byte[] orig_redirect; public long Orig_file_len() {return orig_file_len;} private long orig_file_len; // used for filtering downloads by file_max - public boolean File_is_orig() {return file_is_orig;} private boolean file_is_orig; // SEE:NOTE_1:Lnki_thumbable + public boolean File_is_orig() {return file_is_orig;} private boolean file_is_orig; // SEE:NOTE_1:Lnki_thumbable public int File_w() {return file_w == -1 ? html_w : file_w;} private int file_w = -1; // NOTE: for itm_meta, file_w == html_w public int Html_uid() {return html_uid;} private int html_uid; public byte Html_elem_tid() {return html_elem_tid;} private byte html_elem_tid; @@ -63,9 +63,9 @@ public class Xof_xfer_itm implements Xof_file_itm { public Io_url Html_orig_url() {return html_orig_url;} private Io_url html_orig_url = Io_url_.Empty; // needed else null_err public int Html_gallery_mgr_h() {return html_gallery_mgr_h;} private int html_gallery_mgr_h; public Js_img_wkr Html_img_wkr() {return html_img_wkr;} private Js_img_wkr html_img_wkr; - public boolean File_exists() {return file_exists;} private boolean file_exists; - public boolean File_exists_in_cache() {return false;} - public boolean Dbmeta_is_new() {return meta_itm.State_new();} + public boolean File_exists() {return file_exists;} private boolean file_exists; + public boolean File_exists_in_cache() {return false;} + public boolean Dbmeta_is_new() {return meta_itm.State_new();} public void Html_elem_tid_(byte v) {html_elem_tid = v;} public void Html_size_(int w, int h) {this.html_w = w; this.html_h = h;} public void Html_gallery_mgr_h_(int v) {html_gallery_mgr_h = v;}