rda-python-common 1.0.38__py3-none-any.whl → 1.0.40__py3-none-any.whl

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/PgLOG.py

@@ -246,7 +246,7 @@ def get_email():
 #
 #  send a customized email with all entries included
 #
-def send_customized_email(logmsg, emlmsg, logact = 0):
+def send_customized_email(logmsg, emlmsg, logact = LOGWRN):
 
    entries = {
       'fr' : ["From",    1, None],
@@ -267,18 +267,20 @@ def send_customized_email(logmsg, emlmsg, logact = 0):
          vals = ms.groups()
          msg = msg.replace(vals[1], '')
          if vals[2]: entries[ekey][2] = vals[2]
-      elif logact and entries[ekey][1]:
+      elif entries[ekey][1]:
          return pglog("{}Missing Entry '{}' for sending email".format(logmsg, entry), logact|ERRLOG)
 
-   ret = send_python_email(entries['sb'][2], entries['to'][2], msg, entries['fr'][2], entries['cc'][2])
-   if ret != SUCCESS and PGLOG['EMLSEND']: ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
+   ret = send_python_email(entries['sb'][2], entries['to'][2], msg, entries['fr'][2], entries['cc'][2], logact)
+   if ret == SUCCESS or not PGLOG['EMLSEND']: return ret
 
+   # try commandline sendmail
+   ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
    logmsg += "Email " + entries['to'][2]
    if entries['cc'][2]: logmsg += " Cc'd " + entries['cc'][2]
    logmsg += " Subject: " + entries['sb'][2]
-   if ret:      
+   if ret:
       log_email(emlmsg)
-      if logact: pglog(logmsg, logact&(~EXITLG))
+      pglog(logmsg, logact&(~EXITLG))
    else:
       errmsg = "Error sending email: " + logmsg
       pglog(errmsg, (logact|ERRLOG)&~EXITLG)
@@ -288,7 +290,7 @@ def send_customized_email(logmsg, emlmsg, logact = 0):
 #
 #  send an email; if empty msg send email message saved in PGLOG['EMLMSG'] instead
 #
-def send_email(subject = None, receiver = None, msg = None, sender = None, logact = 0):
+def send_email(subject = None, receiver = None, msg = None, sender = None, logact = LOGWRN):
 
    return send_python_email(subject, receiver, msg, sender, None, logact)
 
@@ -296,7 +298,7 @@ def send_email(subject = None, receiver = None, msg = None, sender = None, logac
 #  send an email via python module smtplib; if empty msg send email message saved
 #  in PGLOG['EMLMSG'] instead. pass cc = '' for skipping 'Cc: '
 #
-def send_python_email(subject = None, receiver = None, msg = None, sender = None, cc = None, logact = 0):
+def send_python_email(subject = None, receiver = None, msg = None, sender = None, cc = None, logact = LOGWRN):
 
    if not msg:
       if PGLOG['EMLMSG']:
@@ -340,7 +342,7 @@ def send_python_email(subject = None, receiver = None, msg = None, sender = None
    finally:
       eml.quit()
       log_email(str(emlmsg))
-      if logact: pglog(logmsg, logact&~EXITLG)
+      pglog(logmsg, logact&~EXITLG)
       return SUCCESS
 
 #
@@ -415,7 +417,7 @@ def pglog(msg, logact = MSGLOG):
    if logact&EMLALL:
       if logact&SNDEML or not msg:
          title = (msg if msg else "Message from {}-{}".format(PGLOG['HOSTNAME'], get_command()))
-         msg = title + '\n' + msg
+         msg = title
          send_email(title.rstrip())
       elif msg:
          set_email(msg, logact)

{rda_python_common-1.0.38.dist-info → rda_python_common-1.0.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.38
+Version: 1.0.40
 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.38.dist-info → rda_python_common-1.0.40.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rda_python_common/PgCMD.py,sha256=EYjG2Z4zEnvsXE1z-jt5UaNoEKxnOYYiMMzvW6HrKA4,20597
-rda_python_common/PgDBI.py,sha256=12qnRXO7pWv8togtTsOvtVuGtwixnR-s2vLGPpdDfHw,74658
+rda_python_common/PgDBI.py,sha256=vyjQSgXRh8THM7Gez5leix9Xv3oz8KsYxppjlbA9Rak,74755
 rda_python_common/PgFile.py,sha256=gJuzBxLRYo3HQyNW1WNYDsQWRei2cco9bYEb6uOL8Ds,98487
-rda_python_common/PgLOG.py,sha256=XYJ4w-CVZrkaK4CMWd6ZjUKWIQSvN9lui4Dtt52VBPI,55277
+rda_python_common/PgLOG.py,sha256=aY6EuPaIJlMEdfxR7_amraiwNnaKyU9CgW1LJ0jXWd4,55295
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
 rda_python_common/PgOPT.py,sha256=Sf--l5iKY82xF5NbXxEy8PWip7ACpaa3KLdMac7E-oc,56047
 rda_python_common/PgSIG.py,sha256=ZVM9Qz6yIFurwIQJtV5-CFbKOTdFsZ-Rs95SEpDFgNk,35795
 rda_python_common/PgSplit.py,sha256=QKPbF55m8KCTGmwVwL3uG_nuylCC4FSVfLuXeLjJHbE,8816
 rda_python_common/PgUtil.py,sha256=OqESKCd72b9g8m8jwjPJhXDtPYlW6G8oSOhwChvz2Cg,48600
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rda_python_common-1.0.38.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.38.dist-info/METADATA,sha256=nz0V4NcLxfDz9qbXb1vLl5Qx8_IiQtauePj-reMX87I,716
-rda_python_common-1.0.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.38.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.38.dist-info/RECORD,,
+rda_python_common-1.0.40.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.40.dist-info/METADATA,sha256=niFKGnpZE0EMwnfXEXhtPfY3jqh7MY6J02G2Rp-84Js,716
+rda_python_common-1.0.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_common-1.0.40.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.40.dist-info/RECORD,,