rda-python-dsupdt 2.0.4__tar.gz → 2.0.6__tar.gz

{rda_python_dsupdt-2.0.4 → rda_python_dsupdt-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsupdt
-Version: 2.0.4
+Version: 2.0.6
 Summary: RDA Python Package to update RDA operational datasets
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsupdt

{rda_python_dsupdt-2.0.4 → rda_python_dsupdt-2.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dsupdt"
-version = "2.0.4"
+version = "2.0.6"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_dsupdt-2.0.4 → rda_python_dsupdt-2.0.6}/src/rda_python_dsupdt/dsupdt.py

@@ -1339,7 +1339,7 @@ class DsUpdt(PgUpdt, PgSplit):
       if re.search(r'(^|\s)-GX(\s|$)', options, re.I):
          wfile = ainfo['wfile'] if 'wfile' in ainfo else ainfo['afile']
          ms = re.search(r'(^|\s)-DF (\w+)(\s|$)', options, re.I)
-         fmt = ms.ms.group(2).lower() if ms else None
+         fmt = ms.group(2).lower() if ms else None
          if wfile and fmt:
             if fmt == "netcdf": fmt = "cf" + fmt
             rs = " -R -S" if tempinfo['RS'] == 1 else ''
@@ -1361,13 +1361,26 @@ class DsUpdt(PgUpdt, PgSplit):
          if locrec['cleancmd']: options = re.sub(r'(^-NW\s+|\s+-NW$)', '', options, 1, re.I)
          acmd += " " + self.replace_pattern(options, tempinfo['edate'], tempinfo['ehour'], tempinfo['FQ'])
       ret = self.pgsystem(acmd, self.PGOPT['emerol'], 69)   # 1 + 4 + 64
-      if gcmd: self.pgsystem(gcmd, self.PGOPT['emerol'], 5)
+      if gcmd: self.call_gatherxml(gcmd)
       if fnote: self.pgsystem("rm -f " + fnote, self.PGOPT['emerol'], 4)
       tempinfo['ainfo'] = self.file_archive_info(lfile, locrec, tempinfo)
       note = self.count_update_files(ainfo, tempinfo['ainfo'], ret, tempinfo['RS'])
       self.pglog("{}: UPDATED({}) for {}".format(lfile, locrec['action'], tempinfo['einfo']), self.PGOPT['emlsum'])
       return ret
 
+   # call gatherxml
+   def call_gatherxml(self, gcmd):
+      logfile = self.PGLOG['LOGFILE']
+      errfile = self.PGLOG['ERRFILE']
+      self.PGLOG['LOGFILE'] = "gatherxml.log"
+      self.PGLOG['ERRFILE'] = "gatherxml.err"
+      self.PGLOG['ERR2STD'] = ["Warning: ", "already up-to-date","process currently running",
+                               "rsync", "No route to host", "''*'"]
+      self.pgsystem(gcmd, self.PGOPT['emerol'], 5)
+      self.PGLOG['LOGFILE'] = logfile
+      self.PGLOG['ERRFILE'] = errfile
+      self.PGLOG['ERR2STD'] = []
+
    # count files updated
    def count_update_files(self, oinfo, ninfo, success, rsopt):
       nrecs = ninfo['types'] if ninfo else {}

{rda_python_dsupdt-2.0.4 → rda_python_dsupdt-2.0.6}/src/rda_python_dsupdt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsupdt
-Version: 2.0.4
+Version: 2.0.6
 Summary: RDA Python Package to update RDA operational datasets
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsupdt