From b2d67f7aea0ec94dee6e2a27b77249dba651ecdb Mon Sep 17 00:00:00 2001 From: "Christopher T. Johnson" Date: Thu, 27 Feb 2025 16:01:13 -0500 Subject: [PATCH] Case Load is working better. #22 --- workers.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/workers.py b/workers.py index 886b97b..efe8c10 100644 --- a/workers.py +++ b/workers.py @@ -106,7 +106,6 @@ def update_db(case_id: str, db: QSqlDatabase) -> int: # # We assume that case_id == docket_id at this point. If it does not, # then we will build out from the request we get - print(f"Updating {case_id}") matches = re.match(r"(\d\d)[-A](\d+)(.*)$", case_id) if matches is None: raise Exception(f"Not a match {case_id}") @@ -301,7 +300,7 @@ class updateThread(QThread): print(db.lastError()) raise Exception("db.open()") - case_id = update_db(str(self.docket_id), db) + update_db(str(self.docket_id), db) db.close() del db QSqlDatabase.removeDatabase("update") @@ -312,6 +311,7 @@ class loadCases(QThread): caseLoaded = Signal(int) year = QDateTime.currentDateTime().toString("yy") number = 0 + edocket = 0 def run(self) -> None: db = QSqlDatabase.cloneDatabase("qt_sql_default_connection", "load") @@ -348,15 +348,31 @@ class loadCases(QThread): docket_id = f"{self.year}A{self.number}" else: docket_id = f"{self.year}-{self.number}" + print(f"Updating: {docket_id} ", end='') query.bindValue(":did", docket_id) if not query.exec(): query_error(query) if query.next(): if query.value("active") == 0: self.number += 1 + print("INACTIVE") continue + print() result = update_db(docket_id, db) if result < 0: + if edocket == 0: + edocket = 1 + self.number = 1 + query.prepare("UPDATE history SET number = :number, " + "edocket=:edocket " + "WHERE history_id=:hid") + query.bindValue(':number', 1) + query.bindValue(':edocket', 1) + query.bindValue(':hid', history_id) + if not query.exec(): + query_error(query) + continue + edocket = 0 self.year = f"{int(self.year) - 1:02d}" if self.number > 1: query.prepare( @@ -391,6 +407,7 @@ class loadCases(QThread): self.number += 1 count += 1 + self.number -= 1 if self.number > 1: query.prepare( "UPDATE history SET number= :number WHERE year = :year"