rda-python-icoads 1.0.14__tar.gz → 1.0.16__tar.gz

{rda_python_icoads-1.0.14/src/rda_python_icoads.egg-info → rda_python_icoads-1.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_icoads
-Version: 1.0.14
+Version: 1.0.16
 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.14 → rda_python_icoads-1.0.16}/pyproject.toml

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

{rda_python_icoads-1.0.14 → rda_python_icoads-1.0.16}/src/rda_python_icoads/PgIMMA.py

@@ -454,7 +454,7 @@ def get_imma_records(cdate, line, records):
          aname = ATTI2NAME[line[offset:offset+2]]
       imma = IMMAS[aname]
       pgrec = get_one_attm(imma[3], offset, line)
-#48      if aname == 'iivad': pgrec['cdi'] = PgUtil.adddate('2014-01-01', 0, 0, I36(pgrec['cdi']), 'YYYMMDD')
+#48      if aname == 'iivad': pgrec['cdi'] = PgUtil.adddate('2014-01-01', 0, 0, I36(pgrec['cdi']), 'YYYYMMDD')
       if aname not in records: records[aname] = initialize_attm_records(imma[3])
       if CURIUID:
          append_one_attm(cdate, imma[0], imma[3], pgrec, records[aname])
@@ -1115,27 +1115,33 @@ def get_imma_date(line):
 def get_itidx_date(uid):
 
    global CURIUID, CURIIDX, CURTIDX
+   if CURRN3 < 0: PgLOG.pglog(f"{uid}: Provide a RN3 (>= 0) to proceed", PgLOG.LGEREX)
    uidx = uid[0:2].lower()
    suid = uid[2:6]
    table = f"{CNTLSC}.itidx_{uidx}"
-   cond = f"suid = '{suid}' AND rn3 = {CURRN3}"
-   pgrec = PgDBI.pgget(table, "*", cond, PgLOG.LGEREX)
-   if not pgrec:
-      msg = "{}-{}: suid-rn3 not in {}".format(suid, CURRN3, table)
-      if CURRN3 < 0:
-         PgLOG.pglog(msg + "\nProvide a RN3 (>= 0) to proceed", PgLOG.LGEREX)
-      else:
-         return PgLOG.pglog(msg + ", SKIP it", PgLOG.WARNLG)
-
+   cond = f"suid = '{suid}'"
+   pgrecs = PgDBI.pgmget(table, "*", cond, PgLOG.LGEREX)
+   ucnt = len(pgrecs['iidx']) if pgrecs else 0
+   if ucnt == 0: return PgLOG.pglog(f"{uid}: not in table {table}, SKIP it", PgLOG.WARNLG)
+
+   uidx = -1
+   for i in range(ucnt):
+      if pgrecs['rn3'][i] == CURRN3:
+         uidx = i
+         break
+   if uidx == -1: return PgLOG.pglog(f"{uid}: not in table {table} for rn3({CURRN3}), SKIP it", PgLOG.WARNLG)
+
+   iidx = pgrecs['iidx'][uidx]
+   tidx = pgrecs['tidx'][uidx]
    if CHKEXIST:    # check
-      table = f"{IVADSC}.{ATTMNAME}_{pgrec['tidx']}"
-      cnd = f"iidx = {pgrec['iidx']}"
+      table = f"{IVADSC}.{ATTMNAME}_{tidx}"
+      cnd = f"iidx = {iidx}"
       if PgDBI.pgget(table, "", cnd): return None
 
    CURIUID = uid
-   CURIIDX = pgrec['iidx']
-   CURTIDX = pgrec['tidx']
-   return pgrec['date']
+   CURIIDX = iidx
+   CURTIDX = tidx
+   return pgrecs['date'][uidx]
 
 #
 # get record date for given year, month and day

{rda_python_icoads-1.0.14 → rda_python_icoads-1.0.16}/src/rda_python_icoads/fillicoads.py

@@ -132,7 +132,7 @@ def process_imma_file(fname, addinventory):
    PgIMMA.identify_attm_name(line)  # check and record standalone attm name
    while line:
       idate = cdate = PgIMMA.get_imma_date(line)
-      if cdate and (PVALS['dtlen'] == 0 or cdate >= PVALS['dates'][0]):
+      if cdate and (PVALS['dtlen'] == 0 or PgUtil.diffdate(cdate, PVALS['dates'][0]) >= 0):
          PgIMMA.init_indices_for_date(cdate, iname)
          records = PgIMMA.get_imma_records(cdate, line, records)
          break
@@ -150,7 +150,7 @@ def process_imma_file(fname, addinventory):
                for i in range(PgIMMA.TABLECOUNT): acounts[i] += acnts[i]
                records = {}
                cdate = idate
-               if PVALS['dtlen'] == 2 and cdate > PVALS['dates'][1]: break
+               if PVALS['dtlen'] == 2 and PgUtil.diffdate(cdate, PVALS['dates'][1]) > 0: break
                PgIMMA.init_indices_for_date(cdate, iname)
             records = PgIMMA.get_imma_records(idate, line, records)
       line = IMMA.readline()

{rda_python_icoads-1.0.14 → rda_python_icoads-1.0.16}/src/rda_python_icoads/imma1_subset.py

@@ -607,9 +607,9 @@ def join_attm_fields(aname, record):
 def subset_table_index(fname, tidx, bdate, edate):
 
    atables = {}
-   PgDBI.set_scname(dbname = 'ivaddb', scname = PgIMMA.IVADSC, lnname = 'ivaddb', dbhost = PgLOG.PGLOG['PMISCHOST'])
+   PgDBI.set_scname(dbname = 'ivaddb', scname = 'ivaddb', lnname = 'ivaddb', dbhost = PgLOG.PGLOG['PMISCHOST'])
 
-   tname = f"{PgIMMA.CTNLSC}.iattm"
+   tname = "cntldb.iattm"
    for aname in PVALS['anames']:
       cnd = f"tidx = {tidx} AND attm = '{aname}'"
       atables[aname] = PgDBI.pgget(tname, "", cnd, PgLOG.LGEREX)

{rda_python_icoads-1.0.14 → rda_python_icoads-1.0.16/src/rda_python_icoads.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_icoads
-Version: 1.0.14
+Version: 1.0.16
 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