rda-python-icoads 1.0.3__tar.gz → 1.0.5__tar.gz

{rda_python_icoads-1.0.3 → rda_python_icoads-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rda_python_icoads
-Version: 1.0.3
+Version: 1.0.5
 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.3 → rda_python_icoads-1.0.5}/pyproject.toml

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

{rda_python_icoads-1.0.3 → rda_python_icoads-1.0.5}/src/rda_python_icoads/README_R3.0_Subset.html

@@ -87,7 +87,7 @@ column of data provided.
 </ul>
 
 <hr>
-<h3>Your data request details for user name, temporal range, spatial domain, and number of records:</h3>
+<h3>Your data request details for user name, temporal range, and spatial domain:</h3>
 
 <ul>  
 <li>User Name: __USER__</li>

{rda_python_icoads-1.0.3 → rda_python_icoads-1.0.5}/src/rda_python_icoads/imma1_subset.py

@@ -403,17 +403,17 @@ def process_subset_request(ridx, rdir, rstr):
    if ptcnt > 0:
       fname = PVALS['rdimma1']
       cnd = "rindex = {} AND wfile = '{}' AND status = 'O'".format(ridx, fname)
-      if op.isfile(fname) and PgDBI.pgget("wfrqst", "", cnd): return
+      if PgDBI.pgget("wfrqst", "", cnd): return
 
    get_subset_info(rstr)
    
    if ptcnt > 0:
       set_var_info()
       PgFile.change_local_directory(rdir, PgLOG.LOGWRN)
-      build_final_files(ridx, rstr)
+      fcnt = build_final_files(ridx, rstr)
    else:
-      tcnt = get_table_info(PVALS['dates'])
-      for i in range(tcnt):
+      fcnt = get_table_info(PVALS['dates'])
+      for i in range(fcnt):
          bdate = PVALS['bdate'][i]
          edate = PVALS['edate'][i]
          tidx = PVALS['tidx'][i]
@@ -422,9 +422,12 @@ def process_subset_request(ridx, rdir, rstr):
          pgrec['disp_order'] = i+1
          pgrec['command'] = pgcmd + " -f -FI"
          pgrec['cmd_detail'] = "dates={} {}&tidx={}".format(bdate, edate, tidx)
-         fname = "ICOADS_R3.0_Rqst{}_{}-{}.csv".format(ridx, bdate, edate)
+         fname = "ICOADS_R3.0_Rqst{}_{}-{}.csv".format(ridx, bdate.replace('-', ''), edate.replace('-', ''))
          PgSubset.add_request_file(ridx, fname, pgrec, PgLOG.LGEREX)
 
+   record = {'fcount' : fcnt}
+   PgDBI.pgupdt('dsrqst', record, "rindex = {}".format(ridx))
+
 #
 # process a validated subset request file
 #
@@ -644,6 +647,8 @@ def build_final_files(ridx, rstr):
    PgFile.local_copy_local(fname, PVALS['codedir'] + fname, PgLOG.LGEREX)
    PgSubset.add_request_file(ridx, fname, pgrec, PgLOG.LGEREX)
 
+   return fcnt
+
 #
 # process reqest info, create command file and the input file list
 #

{rda_python_icoads-1.0.3 → rda_python_icoads-1.0.5}/src/rda_python_icoads.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rda_python_icoads
-Version: 1.0.3
+Version: 1.0.5
 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