rda-python-dsarch 1.0.16__tar.gz → 1.0.19__tar.gz

{rda_python_dsarch-1.0.16 → rda_python_dsarch-1.0.19}/PKG-INFO

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

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

{rda_python_dsarch-1.0.16 → rda_python_dsarch-1.0.19}/src/rda_python_dsarch/PgMeta.py

@@ -595,7 +595,7 @@ def process_meta_gather(cate, logact = PgLOG.LOGWRN):
             if PgLOG.PGLOG['DSCHECK'] and cnt > 0 and (cnt%10) == 0:
                PgCMD.add_dscheck_dcount(10, 0, logact)
          elif PgLOG.PGLOG['SYSERR']:
-            PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'])
+            PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'], act)
    PgLOG.PGLOG['ERR2STD'] = []
 
    if cnt > 0:
@@ -642,7 +642,7 @@ def process_meta_delete(cate, logact = PgLOG.LOGWRN):
          if PgSIG.start_background(cmd, act, opt, 1):
             cnt += dcnt
          elif PgLOG.PGLOG['SYSERR']:
-            PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'])
+            PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'], act)
    PgLOG.PGLOG['ERR2STD'] = []
 
    if cnt > 0:
@@ -667,7 +667,7 @@ def delete_file_metadata(dsid, file, logact = PgLOG.LOGWRN):
    PgLOG.PGLOG['ERR2STD'] = ["Warning: "]
    switch_logfile("gatherxml")
    if not PgLOG.pgsystem("{} -d {} {}".format(CMD['DX'], d, file), logact, opt) and PgLOG.PGLOG['SYSERR']:
-      PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'])
+      PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'], logact)
    PgLOG.PGLOG['ERR2STD'] = []
    switch_logfile()
 
@@ -705,7 +705,7 @@ def process_meta_move(cate, logact = PgLOG.LOGWRN):
          if PgSIG.start_background(cmd, act, opt, 1):
             cnt += 1
          elif PgLOG.PGLOG['SYSERR']:
-            PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'])
+            PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'], act)
    PgLOG.PGLOG['ERR2STD'] = []
 
    if cnt > 0:
@@ -741,7 +741,7 @@ def process_meta_summary(cate, logact = PgLOG.LOGWRN):
          if PgSIG.start_background(cmd, act, opt, 1):
             cnt += 1
          elif PgLOG.PGLOG['SYSERR']:
-            PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'])
+            PgDBI.record_dscheck_error(PgLOG.PGLOG['SYSERR'], act)
    PgLOG.PGLOG['ERR2STD'] = []
 
    if cnt > 0:

{rda_python_dsarch-1.0.16 → rda_python_dsarch-1.0.19}/src/rda_python_dsarch/dsarch.py

@@ -2040,7 +2040,7 @@ def restore_backup_savedfiles():
    if 'EM' in PgOPT.params: PgLOG.PGLOG['PRGMSG'] = ""
 
 #
-# cross copy quasar backup files between Globus endpoints rda-quasar and rda-quasar-drdata
+# cross copy quasar backup files between Globus endpoints gdex-quasar and gdex-quasar-drdata
 #
 def crosscopy_backup_files():
 
@@ -2052,8 +2052,8 @@ def crosscopy_backup_files():
    s = 's' if ALLCNT > 1 else ''
    bidx = chksize = 0
    dflags = {}
-   bpoint = 'rda-quasar'
-   dpoint = 'rda-quasar-drdata'
+   bpoint = 'gdex-quasar'
+   dpoint = 'gdex-quasar-drdata'
    PgLOG.pglog("Cross Copy {} Quasar file{} of {} ...".format(ALLCNT, s, dsid), PgLOG.WARNLG)
 
    PgOPT.validate_multiple_values(tname, ALLCNT)
@@ -3326,7 +3326,7 @@ def set_one_backfile(i, pgrec, file, flds, type, ndsid = None, record = None):
          record['dsid'] = dsid
          record['uid'] = PgOPT.PGOPT['UID']
          if 'status' not in record: record['status'] = 'A'
-         info = PgFile.check_backup_file("/{}/{}".format(dsid, file), 'rda-quasar', 1, PgOPT.PGOPT['emerol'])
+         info = PgFile.check_backup_file("/{}/{}".format(dsid, file), 'gdex-quasar', 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']
@@ -4156,8 +4156,8 @@ def move_backup_files():
    tname = 'bfile'
    dsid = PgOPT.params['DS']
    dcnd = "dsid = '{}'".format(dsid)
-   bkend = "rda-quasar"
-   drend = 'rda-quasar-drdata'
+   bkend = "gdex-quasar"
+   drend = 'gdex-quasar-drdata'
    bidx = chksize = 0
 
    tmpds = None
@@ -4566,8 +4566,8 @@ def delete_backup_files():
    dsid = PgOPT.params['DS']
    dcnd = "dsid = '{}'".format(dsid)
    brec = {'bid' : 0}
-   bkend = "rda-quasar"
-   drend = "rda-quasar-drdata"
+   bkend = "gdex-quasar"
+   drend = "gdex-quasar-drdata"
    s = 's' if ALLCNT > 1 else ''
    PgLOG.pglog("Delete {} Backup file{} from {} ...".format(ALLCNT, s, dsid), PgLOG.WARNLG)
 

{rda_python_dsarch-1.0.16 → rda_python_dsarch-1.0.19}/src/rda_python_dsarch/dsarch.usg

@@ -1657,7 +1657,6 @@ IMMA_2.4_2007.tar<:>37<:>IMMA<:>Z.TAR<:>D<:>656820224<:>
          [-(LN|LoginName) LoginAccountName]
          [-(DB|Debug) DebugModeInfo]
 
-
   Mode options that can be specified for this action:
       -(MD|MyDataset) - overrides the default specialist and enables RDADB 
                         information to be set by any one
@@ -2178,8 +2177,8 @@ Information options are used to pass information, one or multiple values, into
   dataset, or begin time of a version control record.
 
   -DA or -AcessFlag, (Alias: -DataAccessFlag, -FileListFlag). flags to show web file
-  lists at Dataset and/or top group levels; B-Both Filelists (default value),
-  C-Complete File List, F-Faceted Browse or N-No File List.
+  lists at Dataset and/or top group levels; B-Both Filelists,
+  C-Complete File List (default value), F-Faceted Browse or N-No File List.
 
   -DB or -Debug, to turn on debug mode with specified information. This option
   provides up to 3 values, they are Debug Level, debug log file path and debug

{rda_python_dsarch-1.0.16 → rda_python_dsarch-1.0.19}/src/rda_python_dsarch.egg-info/PKG-INFO

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