From 5d099a7e8d7c42fd6afea6e19ef8f8331aade076 Mon Sep 17 00:00:00 2001 From: zaihuaji Date: Fri, 13 Mar 2026 09:36:12 -0500 Subject: [PATCH 1/4] fix pgchksum.py --- pyproject.toml | 2 +- src/rda_python_dbms/pgchksum.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index da65b32..629e0da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "rda_python_dbms" -version = "2.0.6" +version = "2.0.7" authors = [ { name="Zaihua Ji", email="zji@ucar.edu" }, ] diff --git a/src/rda_python_dbms/pgchksum.py b/src/rda_python_dbms/pgchksum.py index 4e4577d..a5a2056 100644 --- a/src/rda_python_dbms/pgchksum.py +++ b/src/rda_python_dbms/pgchksum.py @@ -211,11 +211,15 @@ def get_checksum_wfilelist(self): cnt = len(pgrecs['wid']) if pgrecs else 0 wfrecs = {} if cnt > 0: + tmpcnt = 0 for i in range(cnt): dsid = pgrecs['dsid'][i] pgrec = self.pgget_wfile(dsid, flds, 'wid = {}'.format(pgrecs['wid'][i])) - pgrec['dsid'] = dsid - self.addrecord(wfrecs, pgrec, i) + if pgrec: + pgrec['dsid'] = dsid + self.addrecord(wfrecs, pgrec, i) + tmpcnt += 1 + cnt = tmpcnt if cnt > 0: if fcnt == 0 or fcnt > cnt: self.PGSUM['c'] = cnt self.PGSUM['f'] = wfrecs @@ -331,7 +335,7 @@ def evaluate_webfile_checksum(self, fcnt, pgrecs, cnts): locflag = pgrec['locflag'] if locflag == 'O': fname = "{}/{}".format(pgrec['dsid'], pgrec['wfile']) - self.evaluate_object_file(fname, pgrec, 'rda-data', cnts) + self.evaluate_object_file(fname, pgrec, 'gdex-data', cnts) else: fname = pgrec['wfile'] if not re.match(r'^/', fname): From 9ad8ef74764a7e9eb971a4b038c95690095321ff Mon Sep 17 00:00:00 2001 From: Zaihua Ji Date: Mon, 16 Mar 2026 09:33:13 -0500 Subject: [PATCH 2/4] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/rda_python_dbms/pgchksum.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rda_python_dbms/pgchksum.py b/src/rda_python_dbms/pgchksum.py index a5a2056..d5b4044 100644 --- a/src/rda_python_dbms/pgchksum.py +++ b/src/rda_python_dbms/pgchksum.py @@ -217,7 +217,7 @@ def get_checksum_wfilelist(self): pgrec = self.pgget_wfile(dsid, flds, 'wid = {}'.format(pgrecs['wid'][i])) if pgrec: pgrec['dsid'] = dsid - self.addrecord(wfrecs, pgrec, i) + self.addrecord(wfrecs, pgrec, tmpcnt) tmpcnt += 1 cnt = tmpcnt if cnt > 0: From 6878b97f8983d9cca3b6b78ae9f31c308a09e9fe Mon Sep 17 00:00:00 2001 From: Zaihua Ji Date: Mon, 16 Mar 2026 09:37:00 -0500 Subject: [PATCH 3/4] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/rda_python_dbms/pgchksum.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rda_python_dbms/pgchksum.py b/src/rda_python_dbms/pgchksum.py index d5b4044..f7f671d 100644 --- a/src/rda_python_dbms/pgchksum.py +++ b/src/rda_python_dbms/pgchksum.py @@ -335,7 +335,7 @@ def evaluate_webfile_checksum(self, fcnt, pgrecs, cnts): locflag = pgrec['locflag'] if locflag == 'O': fname = "{}/{}".format(pgrec['dsid'], pgrec['wfile']) - self.evaluate_object_file(fname, pgrec, 'gdex-data', cnts) + self.evaluate_object_file(fname, pgrec, self.PVALS['BUCKET'], cnts) else: fname = pgrec['wfile'] if not re.match(r'^/', fname): From 583541901f9a51a17dee0bbeb27409ac8035eef8 Mon Sep 17 00:00:00 2001 From: zaihuaji Date: Mon, 16 Mar 2026 09:40:12 -0500 Subject: [PATCH 4/4] self.PVALS['BUCKET'] = 'gdex-data' --- src/rda_python_dbms/pgchksum.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rda_python_dbms/pgchksum.py b/src/rda_python_dbms/pgchksum.py index f7f671d..88c0d8b 100644 --- a/src/rda_python_dbms/pgchksum.py +++ b/src/rda_python_dbms/pgchksum.py @@ -176,7 +176,7 @@ def send_check_email(self, cnt, fcnt): # get the checksum filelist for wfile def get_checksum_wfilelist(self): self.PVALS['TYPE'] = "Web" - self.PVALS['BUCKET'] = 'rda-data' + self.PVALS['BUCKET'] = 'gdex-data' flds = "wid, wfile, type, locflag, data_size, checksum, date_modified, time_modified" if self.PGSUM['f']: pgrecs = self.pgmhget('wfile', 'wid, dsid', {'wfile' : self.PGSUM['f']}) @@ -230,7 +230,7 @@ def get_checksum_wfilelist(self): # get the checksum filelist for sfile def get_checksum_sfilelist(self): self.PVALS['TYPE'] = "Saved" - self.PVALS['BUCKET'] = 'rda-decsdata' + self.PVALS['BUCKET'] = 'gdex-decsdata' flds = "sid, sfile, dsid, type, locflag, data_size, checksum, date_modified, time_modified" hcnd = {} fcnt = self.PGSUM['c'] @@ -352,7 +352,7 @@ def evaluate_savedfile_checksum(self, fcnt, pgrecs, cnts): locflag = pgrec['locflag'] if locflag == 'O': fname = "{}/{}".format(pgrec['dsid'], pgrec['sfile']) - self.evaluate_object_file(fname, pgrec, 'rda-decsdata', cnts) + self.evaluate_object_file(fname, pgrec, self.PVALS['BUCKET'], cnts) else: fname = pgrec['sfile'] if not re.match(r'^/', fname):