rda-python-dsarch 1.0.12__tar.gz → 1.0.14__tar.gz

{rda_python_dsarch-1.0.12 → rda_python_dsarch-1.0.14}/PKG-INFO

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

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

{rda_python_dsarch-1.0.12 → rda_python_dsarch-1.0.14}/src/rda_python_dsarch/dsarch.py

@@ -1006,7 +1006,7 @@ def archive_saved_files():
 #
 def crosscopy_web_files(aname):
 
-   global ALLCNT, MODCNT, RETSTAT
+   global MODCNT, RETSTAT
    tname = 'wfile'
    dsid = PgOPT.params['DS']
    s = 's' if ALLCNT > 1 else ''
@@ -1167,7 +1167,7 @@ def crosscopy_web_files(aname):
 #
 def crosscopy_help_files(aname):
 
-   global ALLCNT, MODCNT, RETSTAT
+   global MODCNT, RETSTAT
    tname = 'hfile'
    dsid = PgOPT.params['DS']
    dcnd = "dsid = '{}'".format(dsid)
@@ -1326,7 +1326,7 @@ def crosscopy_help_files(aname):
 #
 def crosscopy_saved_files(aname):
 
-   global ALLCNT, MODCNT, RETSTAT
+   global MODCNT, RETSTAT
    tname = 'sfile'
    dsid = PgOPT.params['DS']
    dcnd = "dsid = '{}'".format(dsid)
@@ -2044,7 +2044,7 @@ def restore_backup_savedfiles():
 #
 def crosscopy_backup_files():
 
-   global ALLCNT, MODCNT, RETSTAT
+   global MODCNT, RETSTAT
    tname = 'bfile'
    qtype = 'D'
    dsid = PgOPT.params['DS']
@@ -2889,8 +2889,7 @@ def set_one_webfile(i, pgrec, file, flds, type, info = None, ndsid = None, sact
          record['uid'] = PgOPT.PGOPT['UID']
          if 'status' not in record: record['status'] = 'P'
          if not info:
-            info = PgFile.check_local_file(PgArch.get_web_path(i, file, 1, type), 
-                                           1, PgOPT.PGOPT['emerol'])
+            info = PgFile.check_local_file(PgArch.get_web_path(i, file, 1, type), 1, PgOPT.PGOPT['emerol'])
          if info:
             if not info['isfile']: return PgLOG.pglog("file: is a directory", PgOPT.PGOPT['emlerr'])
             record['data_size'] = info['data_size']
@@ -3031,15 +3030,18 @@ def set_one_helpfile(i, pgrec, file, flds, type, info = None, ndsid = None):
          if 'status' not in record: record['status'] = 'P'
          if not (info or 'url' in record):
             info = PgFile.check_local_file(PgArch.get_help_path(i, file, 1, type), 1, PgOPT.PGOPT['emerol'])
-            if info:
-               if not info['isfile']: return PgLOG.pglog("file: is a directory", PgOPT.PGOPT['emlerr'])
-               record['data_size'] = info['data_size']
-               record['date_modified'] = info['date_modified']
-               record['time_modified'] = info['time_modified']
-               record['date_created'] = info['date_created'] if 'date_created' in info else record['date_modified']
-               record['time_created'] = info['time_created'] if 'time_created' in info else record['time_modified']
-            else:
-               return PgLOG.pglog("{}-{}: {}".format(type, file, PgLOG.PGLOG['MISSFILE']), PgOPT.PGOPT['emlerr'])
+         if info:
+            if not info['isfile']: return PgLOG.pglog("file: is a directory", PgOPT.PGOPT['emlerr'])
+            record['data_size'] = info['data_size']
+            record['date_modified'] = info['date_modified']
+            record['time_modified'] = info['time_modified']
+            record['date_created'] = info['date_created'] if 'date_created' in info else record['date_modified']
+            record['time_created'] = info['time_created'] if 'time_created' in info else record['time_modified']
+         elif 'url' in record:
+            record['locflag'] = 'R'
+            record['date_modified'] = PgUtil.curdate()
+         else:
+            return PgLOG.pglog("{}-{}: {}".format(type, file, PgLOG.PGLOG['MISSFILE']), PgOPT.PGOPT['emlerr'])
          if 'disp_order' not in record:
             record['disp_order'] = PgArch.get_next_disp_order(dsid, 0, tname, type)
          hid = PgDBI.pgadd(tname, record, PgLOG.LGEREX|PgLOG.AUTOID)
@@ -3806,7 +3808,6 @@ def saved_to_web_files():
 #
 def delete_web_files():
 
-   global RETSTAT
    tname = 'wfile'
    dsid = PgOPT.params['DS']
    bucket = "rda-data"
@@ -3920,7 +3921,6 @@ def delete_web_files():
 #
 def delete_help_files():
 
-   global RETSTAT
    tname = 'hfile'
    dsid = PgOPT.params['DS']
    bucket = "rda-data"

{rda_python_dsarch-1.0.12 → rda_python_dsarch-1.0.14}/src/rda_python_dsarch.egg-info/PKG-INFO

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