rda-python-icoads 1.0.11__py3-none-any.whl → 1.0.12__py3-none-any.whl

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

@@ -52,23 +52,28 @@ def main():
          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 +82,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
 #

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.dist-info → rda_python_icoads-1.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_icoads
-Version: 1.0.11
+Version: 1.0.12
 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.dist-info → rda_python_icoads-1.0.12.dist-info}/RECORD

@@ -1,19 +1,19 @@
-rda_python_icoads/PgIMMA.py,sha256=V3w5A3ZozWBMvBoEuL-XqY6kUetQQodkEAqGb3Uvd2g,58958
+rda_python_icoads/PgIMMA.py,sha256=VbUR-pmK0_EXnL3qVTKgnpYE2EEy3a6QioQTbOpeWBk,59029
 rda_python_icoads/R3.0-stat_doc.pdf,sha256=7f9wKlaTV7ZWXCqyZ4MZ3QcL5pw-Hz623A3xe8QCoFM,59515
 rda_python_icoads/README_R3.0_Subset.html,sha256=tf5Om69KsZZ9ksIjIwtGQUtU8O4U-fqOrIxrl_4tRPo,6878
 rda_python_icoads/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 rda_python_icoads/checkicoads.py,sha256=nbA09uqaVBf9BHPWWeLFke3sRAGgV7CyOG4VIKI33wY,6599
-rda_python_icoads/cleanicoads.py,sha256=A7JuwYbaVHjVpZFuQZBd9YMQTdMnu7YiqSmbnq058BI,4936
+rda_python_icoads/cleanicoads.py,sha256=JkTbMt8qnekQLfAnqFKHOTYVKCsxIvsT-VsqDE0vdDI,5074
 rda_python_icoads/countattm.py,sha256=syrEKhO-z1Xb-SjtbqHhzSvywuC_72hyex9K_0uUwzg,3578
 rda_python_icoads/countattmvar.py,sha256=BYUSK2qTi0wKHg97gAOye95BJj8c3w728aoumL0C5ns,7498
 rda_python_icoads/counticoads.py,sha256=GB7mRXXQ80Ty_1UF4hyYxrO0IPOeUCq5JUhoxkuvXZs,4555
 rda_python_icoads/countsst.py,sha256=Sx3RicOdEQOXjXrBEUxnTTt6xgoeM2qPLwIMKBBIdps,6362
-rda_python_icoads/fillicoads.py,sha256=9AmMvchdKIundNBzZ4sRC1LJKplD_-qEzmgv6zYCOvQ,4530
+rda_python_icoads/fillicoads.py,sha256=wQue03SzXAopsMOxzDf6znbC4WIey1utDRzBLYlxjPY,4929
 rda_python_icoads/fillinventory.py,sha256=eRNw6laHsF_Ry5SVOJCulDNa4T-9FTT2UObt__Pr3IM,4144
 rda_python_icoads/fillitable.py,sha256=_zCUuYZifMZUoBO8JSY0DcoQOM33smQ1WtWJWnlH3ks,9941
 rda_python_icoads/fillmonth.py,sha256=Abo_5KoX4Zs-vlYcEvovo14xEiO_BNgUxV5fFxT-L3M,2546
 rda_python_icoads/fixiidx.py,sha256=hPOuwB2I46KGE4qWF1f1T6vi7914JICOmE1youneNm4,2036
-rda_python_icoads/imma1_subset.py,sha256=8r130jzm4b9IPjMJBwwRvWrdgxDnXC8KbQjFwiE7LPA,23704
+rda_python_icoads/imma1_subset.py,sha256=0fOS91f4QnprxwakurgXo22sl93yBF_Z5e3peitsZgM,23829
 rda_python_icoads/maxsst.py,sha256=pybyuke-2I2ZJ9EOfp0iyyR3IJig5a5p3PnDG78ArTs,8082
 rda_python_icoads/msg,sha256=J5lkNELaJke718h8VJgqbR0v_nkivStfW0xKz30sVJw,27153
 rda_python_icoads/msg3.0_subset_readme.txt,sha256=Nb3rFq4lkxBDhSzS5XLCgCkZpozUGefy2JkUh1gk0Wo,4144
@@ -22,9 +22,9 @@ rda_python_icoads/msg_download.py,sha256=SqJVdVs6kN-ZLh1d4rSMS4IkRdRrYf5c4Y45zV7
 rda_python_icoads/msgsubset.f,sha256=KuM2WAk0ZFEH8LBhHKiGWt8zaW_0ARJXYV2kiD5w5xs,21253
 rda_python_icoads/rdimma1_csv.f,sha256=_hOHvA0UiTykCIsj7ZYkmooNmUq29-p7ZnyjeSyvt8U,22443
 rda_python_icoads/writeicoads.py,sha256=nNgcPTFw957qsBkMVXgrPAkj3qmG8g5b6NeePp4NkNk,5270
-rda_python_icoads-1.0.11.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_icoads-1.0.11.dist-info/METADATA,sha256=NifFZKjPfCWq9ZuV3LLLv-ueRsoWP20J2_wYw8_x1UI,795
-rda_python_icoads-1.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_icoads-1.0.11.dist-info/entry_points.txt,sha256=O4wzIJ3tibs6BADt2-9O51suWVggGg3CKVq6PJ2TC1g,774
-rda_python_icoads-1.0.11.dist-info/top_level.txt,sha256=PjJe4PwUIiNxPlNg2d8JNPY1SLSu-_GHAdXe-hUVU1U,18
-rda_python_icoads-1.0.11.dist-info/RECORD,,
+rda_python_icoads-1.0.12.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_icoads-1.0.12.dist-info/METADATA,sha256=7ZgOF-epOwnY97Q5Imm8Dj4Zdb0Bp9JnxR9fJZkbKmU,795
+rda_python_icoads-1.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_icoads-1.0.12.dist-info/entry_points.txt,sha256=O4wzIJ3tibs6BADt2-9O51suWVggGg3CKVq6PJ2TC1g,774
+rda_python_icoads-1.0.12.dist-info/top_level.txt,sha256=PjJe4PwUIiNxPlNg2d8JNPY1SLSu-_GHAdXe-hUVU1U,18
+rda_python_icoads-1.0.12.dist-info/RECORD,,