rda-python-common 2.0.6__tar.gz → 2.0.8__tar.gz

{rda_python_common-2.0.6 → rda_python_common-2.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 2.0.6
+Version: 2.0.8
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common

{rda_python_common-2.0.6 → rda_python_common-2.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "2.0.6"
+version = "2.0.8"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_common-2.0.6 → rda_python_common-2.0.8}/src/rda_python_common/PgDBI.py

@@ -323,11 +323,12 @@ def aborttran(autocommit = True):
 #
 def record_dscheck_error(errmsg, logact = PGDBI['EXITLG']):
 
-   cnd = PgLOG.PGLOG['DSCHECK']['chkcnd']
+   check = PgLOG.PGLOG['DSCHECK']
+   chkcnd = check['chkcnd'] if 'chkcnd' in check else "cindex = {}".format(check['cindex'])
+   dflags = check['dflags'] if 'dflags' in check else ''
    if PgLOG.PGLOG['NOQUIT']: PgLOG.PGLOG['NOQUIT'] = 0
-   dflags = PgLOG.PGLOG['DSCHECK']['dflags']
 
-   pgrec = pgget("dscheck", "mcount, tcount, lockhost, pid", cnd, logact)
+   pgrec = pgget("dscheck", "mcount, tcount, lockhost, pid", chkcnd, logact)
    if not pgrec: return 0
    if not pgrec['pid'] and not pgrec['lockhost']: return 0
    (chost, cpid) = PgLOG.current_process_info()
@@ -350,7 +351,7 @@ def record_dscheck_error(errmsg, logact = PGDBI['EXITLG']):
       if pgrec['tcount'] > 1: errmsg = "Try {}: {}".format(pgrec['tcount'], errmsg)
       record['errmsg'] = errmsg
 
-   return pgupdt("dscheck", record, cnd, logact)
+   return pgupdt("dscheck", record, chkcnd, logact)
 
 #
 # local function to log query error

{rda_python_common-2.0.6 → rda_python_common-2.0.8}/src/rda_python_common/pg_dbi.py

@@ -248,10 +248,11 @@ class PgDBI(PgLOG):
    # record error message to dscheck record and clean the lock
    def record_dscheck_error(self, errmsg, logact = None):
       if logact is None: logact = self.PGDBI['EXITLG']
-      cnd = self.PGLOG['DSCHECK']['chkcnd']
+      check = PgLOG.PGLOG['DSCHECK']
+      chkcnd = check['chkcnd'] if 'chkcnd' in check else "cindex = {}".format(check['cindex'])
+      dflags = check['dflags'] if 'dflags' in check else ''
       if self.PGLOG['NOQUIT']: self.PGLOG['NOQUIT'] = 0
-      dflags = self.PGLOG['DSCHECK']['dflags']
-      pgrec = self.pgget("dscheck", "mcount, tcount, lockhost, pid", cnd, logact)
+      pgrec = self.pgget("dscheck", "mcount, tcount, lockhost, pid", chkcnd, logact)
       if not pgrec: return 0
       if not pgrec['pid'] and not pgrec['lockhost']: return 0
       (chost, cpid) = self.current_process_info()
@@ -271,7 +272,7 @@ class PgDBI(PgLOG):
          errmsg = self.break_long_string(errmsg, 512, None, 50, None, 50, 25)
          if pgrec['tcount'] > 1: errmsg = "Try {}: {}".format(pgrec['tcount'], errmsg)
          record['errmsg'] = errmsg
-      return self.pgupdt("dscheck", record, cnd, logact)
+      return self.pgupdt("dscheck", record, chkcnd, logact)
 
    # local function to log query error
    def qelog(self, dberror, sleep, sqlstr, vals, pgcnt, logact = None):

{rda_python_common-2.0.6 → rda_python_common-2.0.8}/src/rda_python_common/pg_file.py

@@ -59,6 +59,7 @@ class PgFile(PgUtil, PgSIG):
          'tar.bz2' : ['tar -cvjf', 'tar -xvf', 'TAR.BZ2']
       }
       self.TARSTR = '|'.join(self.PGTARS)
+      self.DELDIRS = {}
       self.TASKIDS = {}   # cache unfinished 
       self.LHOST = "localhost"
       self.OHOST = self.PGLOG['OBJCTSTR']
@@ -67,6 +68,7 @@ class PgFile(PgUtil, PgSIG):
       self.OBJCTCMD = "isd_s3_cli"
       self.BACKCMD = "dsglobus"
       self.DIRLVLS = 0
+      self.BFILES = {}  # cache backup file names and dates for each bid
       # record how many errors happen for working with HPSS, local or remote machines
       self.ECNTS = {'D' : 0, 'H' : 0, 'L' : 0, 'R' : 0, 'O' : 0, 'B' : 0}
       # up limits for how many continuing errors allowed
@@ -105,7 +107,6 @@ class PgFile(PgUtil, PgSIG):
          'gdex-quasar' : "NCAR GDEX Quasar",
          'gdex-quasar-drdata' : "NCAR GDEX Quasar DRDATA"
       }
-      self.BFILES = {}  # cache backup file names and dates for each bid
 
    # reset the up limit for a specified error type
    def reset_error_limit(self, etype, lmt):

{rda_python_common-2.0.6 → rda_python_common-2.0.8}/src/rda_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 2.0.6
+Version: 2.0.8
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common