rda-python-dsarch 1.0.15__tar.gz → 1.0.18__tar.gz

{rda_python_dsarch-1.0.15 → rda_python_dsarch-1.0.18}/PKG-INFO

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

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

{rda_python_dsarch-1.0.15 → rda_python_dsarch-1.0.18}/src/rda_python_dsarch/PgMeta.py

@@ -592,10 +592,10 @@ def process_meta_gather(cate, logact = PgLOG.LOGWRN):
          cmd += ary[0]
          if PgSIG.start_background(cmd, act, opt, 1):
             cnt += 1
-            if PgLOG.PGLOG['DSCHECK'] and cnt > 0 and (cnt%20) == 0:
+            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:
@@ -608,9 +608,6 @@ def process_meta_gather(cate, logact = PgLOG.LOGWRN):
             for tidx in TIDXS:
                PgLOG.pgsystem("{}{}".format(sx, tidx), act, opt)
 
-      if PgLOG.PGLOG['DSCHECK'] and (cnt%20) > 0:
-         PgCMD.add_dscheck_dcount(int((cnt%20)/2), 0, logact)
-
    del META[c]
    TIDXS = {}
    switch_logfile()
@@ -645,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:
@@ -670,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()
 
@@ -708,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:
@@ -744,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.15 → rda_python_dsarch-1.0.18}/src/rda_python_dsarch/dsarch.py

@@ -390,11 +390,11 @@ def archive_web_files():
    while True:
       for i in range(bidx, ALLCNT):
          if PgSIG.PGSIG['BPROC'] < 2 and i > bidx and ((i-bidx)%20) == 0:
-            if PgLOG.PGLOG['DSCHECK']:
-               PgCMD.set_dscheck_dcount(i, chksize, PgOPT.PGOPT['extlog'])
             if metacnt >= PgOPT.PGOPT['RSMAX']:
                metatotal += PgMeta.process_metadata("W", metacnt, PgOPT.PGOPT['emerol'])
                metacnt = 0
+            if PgLOG.PGLOG['DSCHECK'] and metacnt == 0:
+               PgCMD.set_dscheck_dcount(i, chksize, PgOPT.PGOPT['extlog'])
             if 'EM' in PgOPT.params:
                PgLOG.PGLOG['PRGMSG'] = "{}/{} of {} web file{} archived/processed".format(acnt, i, ALLCNT, s)
          lfile = locfile = PgOPT.params['LF'][i]
@@ -2760,11 +2760,11 @@ def set_webfile_info(include = None):
    reorder = metatotal = metacnt = ADDCNT = MODCNT = 0
    for i in range(bidx, ALLCNT):
       if i > bidx and ((i-bidx)%20) == 0:
-         if PgLOG.PGLOG['DSCHECK']:
-            PgCMD.add_dscheck_dcount(20, 0, PgOPT.PGOPT['extlog'])
          if metacnt >= PgOPT.PGOPT['RSMAX']:
             metatotal += PgMeta.process_metadata("W", metacnt, PgOPT.PGOPT['emerol'])
             metacnt = 0
+         if PgLOG.PGLOG['DSCHECK'] and metacnt == 0:
+            PgCMD.set_dscheck_dcount(i, 0, PgOPT.PGOPT['extlog'])
          if 'EM' in PgOPT.params:
             PgLOG.PGLOG['PRGMSG'] = "{}/{}/{} of {} {} Web file record{} added/modified/processed".format(ADDCNT, MODCNT, i, ALLCNT, dsid, s)
       if not PgOPT.params['WF'][i]: continue

{rda_python_dsarch-1.0.15 → rda_python_dsarch-1.0.18}/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.15 → rda_python_dsarch-1.0.18}/src/rda_python_dsarch.egg-info/PKG-INFO

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