Skip to content

Hua work dbms #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zaihuaji merged 5 commits into from
Mar 16, 2026
Merged

Hua work dbms #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d099a7
fix pgchksum.py
Mar 13, 2026
3fb03f4
Merge pull request #47 from NCAR/main
zaihuaji Mar 16, 2026
9ad8ef7
Potential fix for pull request finding
zaihuaji Mar 16, 2026
6878b97
Potential fix for pull request finding
zaihuaji Mar 16, 2026
5835419
self.PVALS['BUCKET'] = 'gdex-data'
Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
]
Expand Down
16 changes: 10 additions & 6 deletions src/rda_python_dbms/pgchksum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']})
Expand Down Expand Up @@ -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, tmpcnt)
tmpcnt += 1
cnt = tmpcnt
if cnt > 0:
if fcnt == 0 or fcnt > cnt: self.PGSUM['c'] = cnt
self.PGSUM['f'] = wfrecs
Expand All @@ -226,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']
Expand Down Expand Up @@ -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, self.PVALS['BUCKET'], cnts)
else:
fname = pgrec['wfile']
if not re.match(r'^/', fname):
Expand All @@ -348,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):
Expand Down
Loading