rda-python-dsarch 2.0.3__py3-none-any.whl → 2.0.5__py3-none-any.whl

rda_python_dsarch/dsarch.py

@@ -2411,7 +2411,7 @@ class DsArch(PgArch, PgMeta):
                if 'status' in record: self.change_wfile_mode(dsid, file, type, pgrec['status'], record['status'])
             if mlink or pgrec['meta_link'] and pgrec['meta_link'] == 'Y': self.set_meta_link(dsid, file)
          else:
-            if record['wfile'] != file: record['wfile'] = file
+            if 'wfile' not in record or record['wfile'] != file: record['wfile'] = file
             record['uid'] = self.PGOPT['UID']
             if 'status' not in record: record['status'] = 'P'
             if not info:
@@ -4123,12 +4123,12 @@ class DsArch(PgArch, PgMeta):
                gindex = "all"
             if not pgrec: continue
             if act == 1 or act&4 and re.search(r'(Y|B|W)', pgrec['meta_link']):
-               self.pgsystem("{} -d {} -rw {}".format(self.PGOPT['scm'], dsid, gindex))
+               self.pgsystem("{} -d {} -rw {}".format(self.PGOPT['scm'], dsid, gindex), self.LOGWRN, 1029)
       else:
          pgrec = self.pgget("dataset", "meta_link", dcnd, self.LGEREX)
          if pgrec:
             if act == 1 or act&4 and re.search(r'(Y|B|W)', pgrec['meta_link']):
-               self.pgsystem("{} -d {} -rw all".format(self.PGOPT['scm'], dsid))
+               self.pgsystem("{} -d {} -rw all".format(self.PGOPT['scm'], dsid, self.LOGWRN, 1029))
    
    # get web file name for given local file name
    def get_archive_filename(self, lfile):

rda_python_dsarch/pg_arch.py

@@ -35,7 +35,7 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          'HS' : '',         # dataset help software path
          'SP' : '',         # dataset savedpath
       }
-      self.ebpaths = {}
+      self.webpaths = {}
       self.savedpaths = {}
       self.grouptypes = {}
       self.CORDERS = {}

rda_python_dsarch/pg_meta.py

@@ -465,7 +465,7 @@ class PgMeta(PgCMD, PgSplit):
       act = logact
       if act&self.EXITLG:
          act &= ~self.EXITLG
-         if self.PGLOG['DSCHECK']: opt |= 256
+         if self.PGLOG['DSCHECK']: opt |= 1280  # 256 + 1024
       self.PGLOG['ERR2STD'] = ["Warning: ", "already up-to-date", "process currently running",
                                 "rsync", "No route to host", "''*'"]
       self.switch_logfile("gatherxml")
@@ -517,7 +517,7 @@ class PgMeta(PgCMD, PgSplit):
       act = logact
       if act&self.EXITLG:
          act &= ~self.EXITLG
-         if self.PGLOG['DSCHECK']: opt |= 256
+         if self.PGLOG['DSCHECK']: opt |= 1280  # 256 + 1024
       self.PGLOG['ERR2STD'] = ["Warning: "]
       self.switch_logfile("gatherxml")
       for d in self.META[c]:
@@ -546,7 +546,7 @@ class PgMeta(PgCMD, PgSplit):
       opt = 5
       if logact&self.EXITLG:
          logact &= ~self.EXITLG
-         if self.PGLOG['DSCHECK']: opt |= 256
+         if self.PGLOG['DSCHECK']: opt |= 1280  # 256 + 1024
       self.PGLOG['ERR2STD'] = ["Warning: "]
       self.switch_logfile("gatherxml")
       if not self.pgsystem("{} -d {} {}".format(self.CMD['DX'], d, file), logact, opt) and self.PGLOG['SYSERR']:
@@ -565,7 +565,7 @@ class PgMeta(PgCMD, PgSplit):
       act = logact
       if act&self.EXITLG:
          act &= ~self.EXITLG
-         if self.PGLOG['DSCHECK']: opt |= 256
+         if self.PGLOG['DSCHECK']: opt |= 1280  # 256 + 1024
       self.PGLOG['ERR2STD'] = ["Warning: "]
       self.switch_logfile("gatherxml")
       for d in self.META[c]:
@@ -605,7 +605,7 @@ class PgMeta(PgCMD, PgSplit):
       act = logact
       if act&self.EXITLG:
          act &= ~self.EXITLG
-         if self.PGLOG['DSCHECK']: opt |= 256
+         if self.PGLOG['DSCHECK']: opt |= 1280  # 256 + 1024
       self.PGLOG['ERR2STD'] = ["Warning: "]
       self.switch_logfile("gatherxml")
       for d in self.META[c]:

{rda_python_dsarch-2.0.3.dist-info → rda_python_dsarch-2.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 2.0.3
+Version: 2.0.5
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch

rda_python_dsarch-2.0.5.dist-info/RECORD

@@ -0,0 +1,14 @@
+rda_python_dsarch/PgArch.py,sha256=d1Y87MT49tgQygLAffNff9Qs4c12KXspYyDG8liSnpQ,59452
+rda_python_dsarch/PgMeta.py,sha256=FV4GytgnJK00FUlyM6iHqpNd7-XTVHO1j5tZtcLTWgY,26845
+rda_python_dsarch/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+rda_python_dsarch/ds_arch.py,sha256=6bR0y6_rhIXyvbuYd-oZfL1YcaHhWBkojjzYz1yCrVg,233810
+rda_python_dsarch/dsarch.py,sha256=3IOiKpAWlduPsJB-doLVMEd-k4pfq2Un3cQ8ZOB9Q2Q,233008
+rda_python_dsarch/dsarch.usg,sha256=vsxGneGCIyzqZx5mwQ8xkTmdNmuny56LgokgDkWt5xE,132034
+rda_python_dsarch/pg_arch.py,sha256=hMAq6IwWzDjjiSkouVcPNZzNJ0nmTT88y-GZRi8SJhE,64599
+rda_python_dsarch/pg_meta.py,sha256=In1Kwe3mJJZ09Ac-SceF7NFdW3AoE01dDFw6eaSQtQk,29623
+rda_python_dsarch-2.0.5.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_dsarch-2.0.5.dist-info/METADATA,sha256=D7lCIn8iH4D3zmwuItdE3g2x5EJBfqLfjfc_dwjrH24,670
+rda_python_dsarch-2.0.5.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+rda_python_dsarch-2.0.5.dist-info/entry_points.txt,sha256=GR7ShgBv8qixS2l4ufAu-jw3N09pbo9zRewwPHqaOxo,60
+rda_python_dsarch-2.0.5.dist-info/top_level.txt,sha256=-vwcMgUXbBdHscvAKB3De9zKac3m_s_FaKIdApP1FGY,18
+rda_python_dsarch-2.0.5.dist-info/RECORD,,

{rda_python_dsarch-2.0.3.dist-info → rda_python_dsarch-2.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

rda_python_dsarch-2.0.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-rda_python_dsarch/PgArch.py,sha256=d1Y87MT49tgQygLAffNff9Qs4c12KXspYyDG8liSnpQ,59452
-rda_python_dsarch/PgMeta.py,sha256=FV4GytgnJK00FUlyM6iHqpNd7-XTVHO1j5tZtcLTWgY,26845
-rda_python_dsarch/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-rda_python_dsarch/ds_arch.py,sha256=6bR0y6_rhIXyvbuYd-oZfL1YcaHhWBkojjzYz1yCrVg,233810
-rda_python_dsarch/dsarch.py,sha256=dN86W98fU6vbp8DnOMpTxVkA-NTvmxLVlaMiHFfo15Y,232945
-rda_python_dsarch/dsarch.usg,sha256=vsxGneGCIyzqZx5mwQ8xkTmdNmuny56LgokgDkWt5xE,132034
-rda_python_dsarch/pg_arch.py,sha256=Ky_RfY8q0Uq7OjK1UC8npkW8v_eyk_aAN7bypecYP-w,64598
-rda_python_dsarch/pg_meta.py,sha256=f_7w9UxhJk1i-QfkmDvNCPrrDYGcOkNPNImXLNZw0sA,29548
-rda_python_dsarch-2.0.3.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_dsarch-2.0.3.dist-info/METADATA,sha256=qZq3KrenH-LV_Np3E0NtnoM93SrEvQNiTE06qVy65vo,670
-rda_python_dsarch-2.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_dsarch-2.0.3.dist-info/entry_points.txt,sha256=GR7ShgBv8qixS2l4ufAu-jw3N09pbo9zRewwPHqaOxo,60
-rda_python_dsarch-2.0.3.dist-info/top_level.txt,sha256=-vwcMgUXbBdHscvAKB3De9zKac3m_s_FaKIdApP1FGY,18
-rda_python_dsarch-2.0.3.dist-info/RECORD,,