rda-python-icoads 1.0.11__tar.gz → 1.0.13__tar.gz

{rda_python_icoads-1.0.11/src/rda_python_icoads.egg-info → rda_python_icoads-1.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_icoads
-Version: 1.0.11
+Version: 1.0.13
 Summary: RDA python package to manage RDA ICOADS datasets
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-icoads

{rda_python_icoads-1.0.11 → rda_python_icoads-1.0.13}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_icoads"
-version = "1.0.11"
+version = "1.0.13"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_icoads-1.0.11 → rda_python_icoads-1.0.13}/src/rda_python_icoads/PgIMMA.py

@@ -1122,8 +1122,10 @@ def get_itidx_date(uid):
    pgrec = PgDBI.pgget(table, "*", cond, PgLOG.LGEREX)
    if not pgrec:
       msg = "{}-{}: suid-rn3 not in {}".format(suid, CURRN3, table)
-      if CURRN3 < 0: msg += "\nProvide a RN3 (>= 0) to proceed"
-      PgLOG.pglog(msg, PgLOG.LGEREX)
+      if CURRN3 < 0:
+         PgLOG.pglog(msg + "\nProvide a RN3 (>= 0) to proceed", PgLOG.LGEREX)
+      else:
+         return PgLOG.pglog(msg + ", SKIP it", PgLOG.WARNLG)
 
    if CHKEXIST:    # check
       table = f"{IVADSC}.{ATTMNAME}_{pgrec['tidx']}"

{rda_python_icoads-1.0.11 → rda_python_icoads-1.0.13}/src/rda_python_icoads/cleanicoads.py

@@ -68,7 +68,7 @@ def main():
       PgLOG.pgexit()
 
    PgLOG.PGLOG['LOGFILE'] = "icoads.log"
-   PgDBI.ivaddb_dbname()
+   PgDBI.set_scname(dbname = 'ivaddb', scname = PgIMMA.IVADSC, lnname = 'ivaddb', dbhost = PgLOG.PGLOG['PMISCHOST'])
    PgLOG.cmdlog("cleanicoads {}".format(' '.join(argv)))
    set_table_info()
    clean_imma_data()   
@@ -80,7 +80,7 @@ def main():
 #
 def set_table_info():
 
-   table = "cntldb.inventory"
+   table = f"{PgIMMA.CNTLSC}.inventory"
    if PVALS['edate']:
       PVALS['dcnd'] = "date BETWEEN '{}' AND '{}'".format(PVALS['bdate'], PVALS['edate'])
    else:
@@ -97,7 +97,7 @@ def set_table_info():
 #
 def clean_imma_data():
 
-   table = "cntldb.inventory"
+   table = f"{PgIMMA.CNTLSC}.inventory"
 
    for i in range(PVALS['tcnt']):
       tidx = PVALS['tinfo']['tidx'][i]
@@ -127,7 +127,7 @@ def clean_imma_data_for_tidx(tidx, cnd):
 #
 def clean_one_attm_for_tidx(aname, tidx, cnd):
 
-   table = "{}_{}".format(aname, tidx)
+   table = f"{PgIMMA.IVADSC}.{aname}_{tidx}"
    if not PgDBI.pgcheck(table): return 0  # not record to delete
 
    if aname == 'iuida': clean_itidx_for_tidx(table, cnd) 
@@ -144,7 +144,7 @@ def clean_one_attm_for_tidx(aname, tidx, cnd):
 #
 def clean_itidx_for_tidx(table, cnd):
 
-   tname = "cntldb.itidx"
+   tname = f"{PgIMMA.CNTLSC}.itidx"
    uids = PgDBI.pgmget(table, "distinct (substring(uid, 1, 2)) uida", cnd, PgLOG.LGEREX)
    ucnt = len(uids['uida']) if uids else 0
    for i in range(ucnt):
@@ -159,7 +159,7 @@ def clean_itidx_for_tidx(table, cnd):
 #
 def clean_iattm_for_tidx(aname, tidx, cnt):
 
-   table = "cntldb.iattm"
+   table = f"{PgIMMA.CNTLSC}.iattm"
    cnd = "attm = '{}' AND tidx = {}".format(aname, tidx)
    pgrec = {'count' : cnt}
    PgDBI.pgupdt(table, pgrec, cnd, PgLOG.LGWNEX)

{rda_python_icoads-1.0.11 → rda_python_icoads-1.0.13}/src/rda_python_icoads/fillicoads.py

@@ -46,29 +46,36 @@ def main():
          leaduid = 1
       elif arg == "-e":
          chkexist = 1
+      elif arg == "-f":
+         option = 'f'
       elif arg == "-r":
          option = 'r'
       elif arg == "-i":
          addinventory = 1
       elif re.match(r'^-', arg):
          PgLOG.pglog(arg + ": Invalid Option", PgLOG.LGWNEX)
+      elif option == 'f':
+         get_imma_filelist(arg)
+         option = None
       elif option == 'r':
          rn3 = int(arg)
+         option = None
       else:
          PVALS['files'].append(arg)
 
    if not PVALS['files']:
-      print("Usage: fillicoads [-a] [-e] [-i] [-r] [-u] FileNameList")
+      print("Usage: fillicoads [-a] [-e] [-f InputFile] [-i] [-r RN3] [-u] FileList")
       print("   At least one file name needs to fill icoads data into Postgres Server")
       print("   Option -a: add all attms, including multi-line ones, such as IVAD and REANQC")
+      print("   Option -f: provide a filename holding a list of IMMA1 files")
       print("   Option -i: add daily counting records into inventory table")
-      print("   Option -r: last digit of IMMA release number")
+      print("   Option -r: the Third digit of IMMA release number")
       print("   Option -u: standalone attachment records with leading 6-character UID")
       print("   Option -e: check existing record before adding attm")
       sys.exit(0)
 
    PgLOG.PGLOG['LOGFILE'] = "icoads.log"
-   PgDBI.set_scname(dbname = 'ivaddb', scname = 'ivaddb1', lnname = 'ivaddb', dbhost = PgLOG.PGLOG['PMISCHOST'])
+   PgDBI.set_scname(dbname = 'ivaddb', scname = PgIMMA.IVADSC, lnname = 'ivaddb', dbhost = PgLOG.PGLOG['PMISCHOST'])
 
    PgLOG.cmdlog("fillicoads {}".format(' '.join(argv)))
    PgIMMA.init_current_indices(leaduid, chkexist, rn3)
@@ -77,6 +84,15 @@ def main():
    PgLOG.cmdlog()
    PgLOG.pgexit()
 
+#
+# read in imma file list from a given file name
+#
+def get_imma_filelist(fname):
+
+   with open(fname, "r") as f:
+      for line in f.readlines():
+         PVALS['files'].append(line.strip())
+
 #
 # fill up imma data
 #
@@ -132,8 +148,9 @@ def process_imma_file(fname, addinventory):
 
    IMMA.close()
 
-   acnts = PgIMMA.add_imma_records(cdate, records)
-   for i in range(PgIMMA.TABLECOUNT): acounts[i] += acnts[i]
+   if cdate and records:
+      acnts = PgIMMA.add_imma_records(cdate, records)
+      for i in range(PgIMMA.TABLECOUNT): acounts[i] += acnts[i]
 
    PgLOG.pglog("{} ({}) filled from {}".format(' '.join(map(str, acounts)), PVALS['names'], op.basename(fname)), PgLOG.LOGWRN)
    

{rda_python_icoads-1.0.11 → rda_python_icoads-1.0.13}/src/rda_python_icoads/imma1_subset.py

@@ -607,10 +607,12 @@ def join_attm_fields(aname, record):
 def subset_table_index(fname, tidx, bdate, edate):
 
    atables = {}
-   PgDBI.ivaddb_scname()
+   PgDBI.set_scname(dbname = 'ivaddb', scname = PgIMMA.IVADSC, lnname = 'ivaddb', dbhost = PgLOG.PGLOG['PMISCHOST'])
 
+   tname = f"{PgIMMA.CTNLSC}.iattm"
    for aname in PVALS['anames']:
-      atables[aname] = PgDBI.pgget('cntldb.iattm', "", "tidx = {} AND attm = '{}'".format(tidx, aname), PgLOG.LGEREX)
+      cnd = f"tidx = {tidx} AND attm = '{aname}'"
+      atables[aname] = PgDBI.pgget(tname, "", cnd, PgLOG.LGEREX)
 
    dstep = int(PgUtil.diffdate(edate, bdate)/PSTEP)
    if dstep == 0: dstep = 1

{rda_python_icoads-1.0.11 → rda_python_icoads-1.0.13/src/rda_python_icoads.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_icoads
-Version: 1.0.11
+Version: 1.0.13
 Summary: RDA python package to manage RDA ICOADS datasets
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-icoads