rda-python-common 3.0.1__tar.gz → 3.0.3__tar.gz

{rda_python_common-3.0.1/src/rda_python_common.egg-info → rda_python_common-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.1
+Version: 3.0.3
 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-3.0.1 → rda_python_common-3.0.3}/pyproject.toml

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

{rda_python_common-3.0.1 → rda_python_common-3.0.3}/src/rda_python_common/PgDBI.py

@@ -1718,25 +1718,6 @@ def reset_rdadb_version(dsid):
 
    pgexec("UPDATE dataset SET version = version + 1 WHERE dsid = '{}'".format(dsid), PGDBI['ERRLOG'])
 
-#
-# check the use rdadb flag in table dataset for a given dataset and given values
-#
-def use_rdadb(dsid, logact = 0, vals = None):
-
-   ret = ''   # default to empty in case dataset not in RDADB
-   if dsid:
-      pgrec = pgget("dataset", "use_rdadb", "dsid = '{}'".format(dsid), PGDBI['EXITLG'])
-      if pgrec:
-         ret = 'N'   # default to 'N' if dataset record in RDADB already
-         if pgrec['use_rdadb']:
-            if not vals: vals = "IPYMW"  # default to Internal; Publishable; Yes RDADB
-            if vals.find(pgrec['use_rdadb']) > -1:
-               ret = pgrec['use_rdadb']
-      elif logact:
-         PgLOG.pglog("Dataset '{}' is not in RDADB!".format(dsid), logact)
-
-   return ret
-
 #
 #   fld: field name for querry condition
 #  vals: reference to aaray of values

{rda_python_common-3.0.1 → rda_python_common-3.0.3}/src/rda_python_common/pg_dbi.py

@@ -1994,32 +1994,6 @@ class PgDBI(PgLOG):
       """
       self.pgexec("UPDATE dataset SET version = version + 1 WHERE dsid = '{}'".format(dsid), self.PGDBI['ERRLOG'])
    
-   def use_rdadb(self, dsid, logact = 0, vals = None):
-      """Return the use_rdadb flag for a dataset if it matches an allowed set.
-
-      Args:
-         dsid (str | None): Dataset ID to query.
-         logact (int): Logging action flags for missing-dataset warnings; default 0.
-         vals (str | None): Accepted flag characters; defaults to 'IPYMW' when None.
-
-      Returns:
-         str: The use_rdadb flag character when found and in vals; 'N' when the
-              dataset exists but the flag is not in vals; '' when dsid is falsy
-              or the dataset is not in RDADB.
-      """
-      ret = ''   # default to empty in case dataset not in RDADB
-      if dsid:
-         pgrec = self.pgget("dataset", "use_rdadb", "dsid = '{}'".format(dsid), self.PGDBI['EXITLG'])
-         if pgrec:
-            ret = 'N'   # default to 'N' if dataset record in RDADB already
-            if pgrec['use_rdadb']:
-               if not vals: vals = "IPYMW"  # default to Internal; Publishable; Yes RDADB
-               if vals.find(pgrec['use_rdadb']) > -1:
-                  ret = pgrec['use_rdadb']
-         elif logact:
-            self.pglog("Dataset '{}' is not in RDADB!".format(dsid), logact)
-      return ret
-
    def get_field_condition(self, fld, vals, isstr = 0, noand = 0):
       """Build a SQL condition fragment for a field given a list of values.
 

{rda_python_common-3.0.1 → rda_python_common-3.0.3}/src/rda_python_common/pg_log.py

@@ -262,22 +262,23 @@ class PgLOG:
                   msg += " with 1 Error:\n"
                else:
                   msg += " with {} Errors:\n".format(self.PGLOG['ERRCNT'])
+               msg += "\nERROR MESSAGE:\n"
                msg +=  self.break_long_string(self.PGLOG['ERRMSG'], 512, None, self.PGLOG['EMLMAX']/2, None, 50, 25)
                self.PGLOG['ERRCNT'] = 0
                self.PGLOG['ERRMSG'] = ''
             if self.PGLOG['SUMMSG']:
-               msg += self.PGLOG['SEPLINE']
-               if self.PGLOG['SUMMSG']: msg += "Summary:\n"
+               msg += "\nSUMMARY:\n"
                msg += self.break_long_string(self.PGLOG['SUMMSG'], 512, None, self.PGLOG['EMLMAX']/2, None, 50, 25)
             if self.PGLOG['EMLMSG']:
-               msg += self.PGLOG['SEPLINE']
-               if self.PGLOG['SUMMSG']: msg += "Detail Information:\n"
+               msg += "\nDETAIL INFORMATION:\n"
             self.PGLOG['EMLMSG'] = msg + self.break_long_string(self.PGLOG['EMLMSG'], 512, None, self.PGLOG['EMLMAX'], None, 50, 40)
             self.PGLOG['SUMMSG'] = ""   # in case not
          else:
             if logact&self.ERRLOG:      # record error for email summary
                self.PGLOG['ERRCNT'] += 1
-               if logact&self.BRKLIN: self.PGLOG['ERRMSG'] += "\n"
+               if self.PGLOG['ERRMSG']:      # blank line between consecutive errors
+                  if not self.PGLOG['ERRMSG'].endswith('\n'): self.PGLOG['ERRMSG'] += "\n"
+                  self.PGLOG['ERRMSG'] += "\n"
                self.PGLOG['ERRMSG'] += "{}. {}".format(self.PGLOG['ERRCNT'], msg)
             elif logact&self.EMLSUM:
                if self.PGLOG['SUMMSG']:

{rda_python_common-3.0.1 → rda_python_common-3.0.3/src/rda_python_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.1
+Version: 3.0.3
 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