rda-python-common 1.0.39__tar.gz → 1.0.41__tar.gz

{rda_python_common-1.0.39 → rda_python_common-1.0.41}/PKG-INFO

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

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

{rda_python_common-1.0.39 → rda_python_common-1.0.41}/src/rda_python_common/PgDBI.py

@@ -46,6 +46,8 @@ DBPASS = {}
 DBNAMES = {
    'ivaddb' : 'ivaddb',
    'cntldb' : 'ivaddb',
+   'ivaddb1' : 'ivaddb',
+   'cntldb1' : 'ivaddb',
    'cdmsdb' : 'ivaddb',
    'ispddb' : 'ispddb',
     'obsua' : 'upadb',
@@ -113,20 +115,21 @@ PGDBI['SCPATH'] = None       # additional schema path for set search_path
 PGDBI['VHSET'] = 0
 PGDBI['PGSIZE'] = 1000        # number of records for page_size
 PGDBI['MTRANS'] = 5000       # max number of changes in one transactions
-PGDBI['MAXICNT'] = 12000000  # maximum number of records in each table
+PGDBI['MAXICNT'] = 6000000  # maximum number of records in each table
 
 #
 # create a pgddl command string with
 # table name (tname), prefix (pre) and suffix (suf)
 #
-def get_pgddl_command(tname, pre = None, suf = None):
+def get_pgddl_command(tname, pre = None, suf = None, scname = None):
 
    ms = re.match(r'^(.+)\.(.+)$', tname)
-   if ms:
-      scname = ms.group(1)
-      tname = ms.group(2)
-   else:
-      scname = PGDBI['SCNAME']
+   if not scname:
+      if ms:
+         scname = ms.group(1)
+         tname = ms.group(2)
+      else:
+         scname = PGDBI['SCNAME']
    xy = ''
    if suf: xy += ' -x ' + suf
    if pre: xy += ' -y ' + pre

{rda_python_common-1.0.39 → rda_python_common-1.0.41}/src/rda_python_common/PgLOG.py

@@ -440,35 +440,42 @@ def pglog(msg, logact = MSGLOG):
       if not logact&NOTLOG:
          if logact&ERRLOG:
             if not PGLOG['ERRFILE']: PGLOG['ERRFILE'] = re.sub(r'.log$', '.err', PGLOG['LOGFILE'])
-            try:
-                ERR = open("{}/{}".format(PGLOG['LOGPATH'], PGLOG['ERRFILE']), 'a')
-            except FileNotFoundError:
-                ERR = open("error.log", 'a')
-                ERR.write(f"Error File not found: {PGLOG['LOGPATH']}/{PGLOG['ERRFILE']}")
-            ERR.write(msg)
-            if not logact&(EMLALL|SKPTRC): ERR.write(get_call_trace())
-            ERR.close()
+            write_message(msg, f"{PGLOG['LOGPATH']}/{PGLOG['ERRFILE']}", logact)
             if logact&EXITLG:
-               LOG = open("{}/{}".format(PGLOG['LOGPATH'], PGLOG['LOGFILE']), "a")
-               LOG.write(cmdstr)
-               LOG.close()
+               write_message(cmdstr, f"{PGLOG['LOGPATH']}/{PGLOG['LOGFILE']}", logact)
          else:
-            LOG = open("{}/{}".format(PGLOG['LOGPATH'], PGLOG['LOGFILE']), 'a')
-            LOG.write(msg)
-            LOG.close()
+            write_message(msg, f"{PGLOG['LOGPATH']}/{PGLOG['LOGFILE']}", logact)
 
    if not PGLOG['BCKGRND'] and logact&(ERRLOG|WARNLG):
-      OUT = sys.stderr if logact&(ERRLOG|EXITLG) else sys.stdout
-      if logact&BRKLIN: OUT.write("\n")
-      if logact&SEPLIN: OUT.write(PGLOG['SEPLINE'])
-      OUT.write(msg)
-
+      write_message(msg, None, logact)
 
    if logact&EXITLG:
       pgexit(1)
    else:
       return (retmsg if retmsg else FAILURE)
 
+#
+# write a log message
+#
+def write_message(msg, file, logact):
+
+   doclose = False
+   errlog = logact&ERRLOG
+   if file:
+      try:
+          OUT = open(file, 'a')
+          doclose = True
+      except FileNotFoundError:
+         OUT = sys.stderr if logact&(ERRLOG|EXITLG) else sys.stdout
+         OUT.write(f"Log File not found: {file}")
+   else:
+      OUT = sys.stderr if logact&(ERRLOG|EXITLG) else sys.stdout
+      if logact&BRKLIN: OUT.write("\n")
+      if logact&SEPLIN: OUT.write(PGLOG['SEPLINE'])
+   OUT.write(msg)
+   if errlog and not logact&(EMLALL|SKPTRC): OUT.write(get_call_trace())
+   if doclose: OUT.close()
+
 #
 # check and disconnet database before exit
 #

{rda_python_common-1.0.39 → rda_python_common-1.0.41}/src/rda_python_common.egg-info/PKG-INFO

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