rda-python-dsquasar 1.0.5__tar.gz → 1.0.7__tar.gz

{rda_python_dsquasar-1.0.5 → rda_python_dsquasar-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsquasar
-Version: 1.0.5
+Version: 1.0.7
 Summary: RDA Python package to backup and recover RDA data archives to and from GLOBUS Quasar backup server
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsquasar

{rda_python_dsquasar-1.0.5 → rda_python_dsquasar-1.0.7}/pyproject.toml

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

{rda_python_dsquasar-1.0.5 → rda_python_dsquasar-1.0.7}/src/rda_python_dsquasar/dsquasar.py

@@ -799,13 +799,13 @@ def transfer_quasar_tarfiles(qinfo):
    dstat = bstat = -1
    if ccnt == 0 or PgSIG.PGSIG['PPID'] > 1:
       if bflg == 'D':
-         dstat = PgFile.quasar_multiple_trasnfer(tofiles, fromfiles, 'rda-quasar-drdata', 'rda-glade', ERRACT)
+         dstat = PgFile.quasar_multiple_trasnfer(tofiles, fromfiles, 'gdex-quasar-drdata', 'gdex-glade', ERRACT)
          if not dstat: PgLOG.pglog("Error Quaser Drdata for " + fmsg, ERRACT|PgLOG.LOGERR)
-      bstat = PgFile.quasar_multiple_trasnfer(tofiles, fromfiles, 'rda-quasar', 'rda-glade', ERRACT)
+      bstat = PgFile.quasar_multiple_trasnfer(tofiles, fromfiles, 'gdex-quasar', 'gdex-glade', ERRACT)
       if not dstat: PgLOG.pglog("Error Quaser Backup for " + fmsg, ERRACT|PgLOG.LOGERR)
       
-      if dstat == PgLOG.FINISH: dstat = PgFile.check_globus_finished(tofiles[0], 'rda-quasar-drdata', ERRACT|PgLOG.NOWAIT)
-      if bstat == PgLOG.FINISH: bstat = PgFile.check_globus_finished(tofiles[0], 'rda-quasar', ERRACT|PgLOG.NOWAIT)
+      if dstat == PgLOG.FINISH: dstat = PgFile.check_globus_finished(tofiles[0], 'gdex-quasar-drdata', ERRACT|PgLOG.NOWAIT)
+      if bstat == PgLOG.FINISH: bstat = PgFile.check_globus_finished(tofiles[0], 'gdex-quasar', ERRACT|PgLOG.NOWAIT)
       if dstat and bstat:
          for fromfile in fromfiles:
             tarfile = PgLOG.PGLOG['DSSDATA'] + fromfile
@@ -1176,7 +1176,7 @@ def gather_dataset_files(dsfiles, dsids, unlock = True):
          dcnd = "dsid = '{}'".format(dsid)
          pgrec = PgDBI.pgget("dataset", "dsid, backflag, pid", dcnd, PgLOG.LGWNEX)
          if pgrec:
-            if unlock and pgrec['pid'] and PgLock.lock_dataset(dsid, 0, PgLOG.LGEREX) < 1: continue
+            if unlock and pgrec['pid'] and PgLock.lock_dataset(dsid, 0, LOGACT) < 1: continue
             fcnt += get_dataset_files(dsid, dsfiles, pgrec['backflag'], PgLOG.LOGWRN)
    else:
       dcnd = "ORDER BY dsid"
@@ -1184,7 +1184,7 @@ def gather_dataset_files(dsfiles, dsids, unlock = True):
       dcnt = len(pgrecs['dsid']) if pgrecs else 0
       for i in range(dcnt):
          dsid = pgrecs['dsid'][i]
-         if unlock and pgrecs['pid'][i] and PgLock.lock_dataset(dsid, 0, PgLOG.LGEREX) < 1: continue
+         if unlock and pgrecs['pid'][i] and PgLock.lock_dataset(dsid, 0, LOGACT) < 1: continue
          fcnt += get_dataset_files(dsid, dsfiles, pgrecs['backflag'][i])
 
    if dsfiles:
@@ -1376,12 +1376,12 @@ def get_backup_tarfile(dsfiles, pgrec):
    return ret
 
 #
-# build fromfile name at Globus endpoint rda-glade
+# build fromfile name at Globus endpoint gdex-glade
 #
 def get_local_globus_file(ftype, bid, dsid, bfile, backflag):
    
    endpath = 'decsdata' if ftype == 'S' else 'data'
-   fromfile = "/{}/rda-quasar/{}/{}".format(endpath, dsid, op.basename(bfile))
+   fromfile = "/{}/gdex-quasar/{}/{}".format(endpath, dsid, op.basename(bfile))
    tarfile = PgLOG.PGLOG['DSSDATA'] + fromfile
 
    if PGBACK['action'] == STTACT or PgFile.check_local_file(tarfile, 0, PgLOG.LGEREX): return fromfile
@@ -1646,9 +1646,9 @@ def process_one_quasar_pathfile(qinfo):
    bstat = dstat = -1
    if ccnt == 0 or PgSIG.PGSIG['PPID'] > 1:
       if bflg == 'D':
-         dstat = PgFile.move_backup_file(tofile, fromfile, 'rda-quasar-drdata', logact)
+         dstat = PgFile.move_backup_file(tofile, fromfile, 'gdex-quasar-drdata', logact)
          if not dstat: PgLOG.pglog("Error Quaser Drdata for " + qmsg, PgLOG.LOGERR)
-      bstat = PgFile.move_backup_file(tofile, fromfile, 'rda-quasar', logact)
+      bstat = PgFile.move_backup_file(tofile, fromfile, 'gdex-quasar', logact)
       if not bstat: PgLOG.pglog("Error Quaser Backup for " + qmsg, PgLOG.LOGERR)
    
       if dstat and bstat:

{rda_python_dsquasar-1.0.5 → rda_python_dsquasar-1.0.7}/src/rda_python_dsquasar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsquasar
-Version: 1.0.5
+Version: 1.0.7
 Summary: RDA Python package to backup and recover RDA data archives to and from GLOBUS Quasar backup server
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsquasar