diff --git a/pyproject.toml b/pyproject.toml index 33d8bac..18f1a44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "rda_python_dsarch" -version = "2.0.1" +version = "2.0.2" authors = [ { name="Zaihua Ji", email="zji@ucar.edu" }, ] diff --git a/src/rda_python_dsarch/dsarch.py b/src/rda_python_dsarch/dsarch.py index 3f20cea..ec97b8a 100644 --- a/src/rda_python_dsarch/dsarch.py +++ b/src/rda_python_dsarch/dsarch.py @@ -306,7 +306,6 @@ def start_actions(self): self.cmdlog(None, 0, self.LOGWRN|self.SNDEML) else: self.cmdlog() - self.pgexit(0) # archive web/object files def archive_web_files(self): @@ -2240,7 +2239,7 @@ def set_group_info(self): if not pgrec or level != pgrec['level']: record['level'] = level if pgrec: modcnt += self.pgupdt(tname, record, "gidx = {}".format(pgrec['gidx']), self.LGEREX) - if pindex: tcnt += self.reset_top_group_index(dsid, gindex, 6) + if pindex: tcnt += self.reset_top_gindex(dsid, gindex, 6) if 'grptype' in record: self.params['WN'] = 6 self.CHGGRPS[gindex] = 1 @@ -4375,10 +4374,10 @@ def reset_top_group_index(self, dsid, act): if 'GI' in self.params: for gindex in self.params['GI']: if gindex is None or gindex in cgidxs: continue - tcnt += self.reset_top_group_index(dsid, gindex, act) + tcnt += self.reset_top_gindex(dsid, gindex, act) cgidxs[gindex] = gindex else: - tcnt += self.reset_top_group_index(dsid, 0, act) + tcnt += self.reset_top_gindex(dsid, 0, act) return tcnt # set the re-archived file counts for groups diff --git a/src/rda_python_dsarch/pg_meta.py b/src/rda_python_dsarch/pg_meta.py index ef1acb4..1ff3dd3 100644 --- a/src/rda_python_dsarch/pg_meta.py +++ b/src/rda_python_dsarch/pg_meta.py @@ -679,7 +679,7 @@ def reset_top_gindex(self, dsid, gindex, act): pgrecs = self.pgmget("dsgroup", "gindex", pcnd, self.LGEREX) cnt = len(pgrecs['gindex']) if pgrecs else 0 for i in range(cnt): - tcnt += self.reset_top_gindex(dsid, pgrecs['gindex'][i]) + tcnt += self.reset_top_gindex(dsid, pgrecs['gindex'][i], act) return tcnt # reset metalink in table wfile