rda-python-dsarch 3.0.3__py3-none-any.whl → 3.0.6__py3-none-any.whl

rda_python_dsarch/PgArch.py

@@ -131,7 +131,6 @@ PgOPT.OPTS = {                         # (!= 0) - setting actions
    'ON' : [1, 'OrderNames',      0],
    'PO' : [1, 'PatternOffset',  16],
    'QS' : [1, 'QsubOptions',     1],
-   'UD' : [1, 'UseDSARCH',       0,  'YNIPW'],  # Internal, Public, Web only, Y - ready for dsarch 
    'VS' : [1, 'ValidSize',      17],  # default to PgLOG.PGLOG['MINSIZE']
    'WI' : [1, 'WaitInternval',   1],
 
@@ -176,7 +175,7 @@ PgOPT.OPTS = {                         # (!= 0) - setting actions
    'OG' : [2, 'OriginGroup',   1],
    'OT' : [2, 'OriginType',    1],
    'PI' : [2, 'ParentIndex',  17],
-   'QF' : [2, 'QuasarFile',    0],
+   'QF' : [2, 'QuasarFile',    0, ''],
    'QT' : [2, 'QuasarFileType',  129, 'BD'],
    'RF' : [2, 'OriginFile',    0],
    'SF' : [2, 'SavedFile',     0],
@@ -257,7 +256,6 @@ PgOPT.ALIAS = {
    'TS' : ['ToSavedFile', 'MovedToSaved'],
    'TW' : ['ToWebFile', 'MovedToWeb'],
    'UC' : ['UpdateCacheNumber'],
-   'UD' : ['UseRDADB'],
    'HD' : ['UpdateHTML', 'GenerateHTML'],
    'UZ' : ['Uncompress', 'UncompressData', 'Unzip'],
    'WC' : ['ValidateChecksum', "WithMD5", "ValidateMD5"],
@@ -281,7 +279,6 @@ PgOPT.TBLHASH['dataset'] = {         # condition flag, 0-int, 1-string, -1-exclu
    'H' : ['WH', "webhome",      1],
    'W' : ['WP', "webpath",      1],
    'F' : ['DF', "data_format",  1],
-   'U' : ['UD', "use_rdadb",    1],
    'L' : ['LC', "locflag",      1],
    'Q' : ['BF', "backflag",     1],
    'A' : ['DA', "accessflag",   1],
@@ -412,7 +409,7 @@ PgOPT.TBLHASH['dsvrsn'] = {
 # global info to be used by the whole application
 PgOPT.PGOPT['MSET']  = "SA"
 #default fields for getting info
-PgOPT.PGOPT['dataset'] = "SWFULQA"
+PgOPT.PGOPT['dataset'] = "SWFLQA"
 PgOPT.PGOPT['dsperiod'] = "GJKXY"
 PgOPT.PGOPT['dsgroup'] = "IGXTPQASW"
 PgOPT.PGOPT['wfile'] = "FTIVMNLHPS"
@@ -420,10 +417,9 @@ PgOPT.PGOPT['sfile'] = "FTIVMNLHPS"
 PgOPT.PGOPT['bfile'] = "FNMTHS"
 PgOPT.PGOPT['hfile'] = 'FMNLTHPSU'
 PgOPT.PGOPT['dsvrsn'] = "VIEDSJX"
-PgOPT.PGOPT['UACTS'] = (PgOPT.OPTS['AQ'][0]|PgOPT.OPTS['SD'][0]|PgOPT.OPTS['DL'][0])
 
 #all fields for getting info
-PgOPT.PGOPT['dsall'] = "TSHWFULQAVCBMPIDNGJKXYIJKXY"   # include 'pdall'
+PgOPT.PGOPT['dsall'] = "TSHWFLQAVCBMPIDNGJKXYIJKXY"   # include 'pdall'
 PgOPT.PGOPT['pdall'] = "GJKXY"
 PgOPT.PGOPT['gpall'] = "IGXTRQAPSWMDN"
 PgOPT.PGOPT['wfall'] = "FTCIXVMNOBQLHPSJKAED"
@@ -492,7 +488,7 @@ def check_enough_options(cact, acts):
       "Miss Saved file types per -ST(-SavedFileType)",
       "Cannot Cross Copy/Move (-XC/-XM) Saved Files",
       "14",
-      "Miss Use-RDADB flag, ('Y', 'P', 'W', 'I'), per -UD(-UseRDADB) for ",
+      "15",
       "16",
       "miss Saved file names per -SF(-SavedFile)",
       "Miss Version Control Index per -VI(-VersionIndex)",
@@ -675,14 +671,8 @@ def check_enough_options(cact, acts):
    elif acts == PgOPT.OPTS['UC'][0] or acts == PgOPT.OPTS['UW'][0]:
       if 'DS' not in PgOPT.params: erridx = 4
 
-   if erridx < 0:
-      if(PgOPT.OPTS[cact][2] > 0 and acts&PgOPT.PGOPT['UACTS'] == 0 and
-         PgDBI.use_rdadb(PgOPT.params['DS'], PgOPT.PGOPT['extlog']) == 'N' and
-         ('UD' not in PgOPT.params or PgOPT.params['UD'] == 'N')):
-         erridx = 15
-         errmsg[erridx] += PgOPT.params['DS']
-
    if erridx >= 0: PgOPT.action_error(errmsg[erridx], cact)
+   PgOPT.validate_dataset()   # error out if the dataset does not exist in RDADB
 
    PgOPT.set_uid("dsarch")   # set uid before any action
    if 'VS' in PgOPT.params: PgLOG.PGLOG['MINSIZE'] = PgOPT.params['VS']   # minimal size for a file to be valid for archive

rda_python_dsarch/__init__.py

@@ -20,7 +20,7 @@ object that existing callers expect.
 
 from . import PgArch, PgMeta
 
-__version__ = "2.0.21"
+__version__ = "2.0.22"
 
 __all__ = [
    "PgArch",

rda_python_dsarch/ds_arch.py

@@ -2264,37 +2264,26 @@ def set_dataset_info(include = None):
    dcnd = "dsid = '{}'".format(dsid)
    PgLOG.pglog("Set {} info of {} ...".format(tname, dsid), PgLOG.WARNLG)
 
-   mcnt = acnt = pcnt = kcnt = 0
+   mcnt = pcnt = kcnt = 0
    fnames = PgOPT.get_field_keys(tname, include)
-   if fnames: # set dataset record
+   if fnames: # set dataset record; new datasets are created via the Metadata Manager, not dsarch
       pgrec = PgDBI.pgget(tname, PgOPT.get_string_fields(fnames, tname), dcnd, PgLOG.LGEREX)
       record = PgOPT.build_record(fnames, pgrec, tname, 0)
-      if record:
+      if record and pgrec:
          if 'backflag' in record and record['backflag'] == 'P': record['backflag'] = 'N'
          if 'locflag' in record and record['locflag'] in 'BR': record['locflag'] = 'G'
-         if pgrec:
-            record['date_change'] = PgUtil.curdate()
-            if PgDBI.pgupdt(tname, record, dcnd, PgLOG.LGEREX):
-               mcnt += 1
-               if 'use_rdadb' in record and re.search(r'^[PYW]$', record['use_rdadb']):
-                  PgOPT.params['WN'] = 6
-         else:
-            record['dsid'] = dsid
-            record['date_change'] = record['date_create'] = PgUtil.curdate()
-            if not record['use_rdadb']: record['use_rdadb'] = 'Y'
-            acnt += PgDBI.pgadd(tname, record, PgLOG.LGEREX)
+         record['date_change'] = PgUtil.curdate()
+         if PgDBI.pgupdt(tname, record, dcnd, PgLOG.LGEREX):
+            mcnt += 1
 
-   if acnt == 0: pcnt = set_period_info(dcnd)   # set dsperiod record
+   pcnt = set_period_info(dcnd)   # set dsperiod record
    kvalues = PgOPT.params['KV'] if 'KV' in PgOPT.params else []
    kcnt = set_keyvalues(dsid, kvalues)
 
-   if (pcnt + kcnt + mcnt + acnt) == 0:
-      if not include: PgLOG.pglog("No change of dataset record for {}!".format(dsid), PgLOG.LOGWRN)   
+   if (pcnt + kcnt + mcnt) == 0:
+      if not include: PgLOG.pglog("No change of dataset record for {}!".format(dsid), PgLOG.LOGWRN)
    else:
-      if acnt:
-         PgLOG.pglog("Dataset record added for {}!".format(dsid),  PgLOG.LOGWRN)
-      else:
-         PgLOG.pglog("Dataset record modified for {}!".format(dsid),  PgLOG.LOGWRN)
+      PgLOG.pglog("Dataset record modified for {}!".format(dsid),  PgLOG.LOGWRN)
       if pcnt + mcnt:
          PgDBI.reset_rdadb_version(dsid)
 
@@ -3846,6 +3835,7 @@ def delete_web_files():
    reorder = metatotal = metacnt = dcnt = mcnt = ocnt = wcnt = 0
    PgArch.cache_group_info(ALLCNT, 0)
    PgOPT.validate_multiple_options(ALLCNT, ["WT", 'VI', 'QF', 'LC'])
+   if 'QF' in PgOPT.params: PgOPT.params['QF'] = PgArch.get_bid_numbers(PgOPT.params['QF'])
 
    if PgLOG.PGLOG['DSCHECK']:
       bidx = PgCMD.set_dscheck_fcount(ALLCNT, PgOPT.PGOPT['extlog'])
@@ -3898,7 +3888,7 @@ def delete_web_files():
             continue
          bid = PgOPT.params['QF'][i] if 'QF' in PgOPT.params else pgrec['bid']
          if bid:
-            PgLOG.pglog(wfile + ": Web file is Quasar backed up, add option -qf '' to force delete", PgOPT.PGOPT['errlog'])
+            PgLOG.pglog(wfile + ": Web file is Quasar backed up, add option -qf 0 to force delete", PgOPT.PGOPT['errlog'])
             continue
          if PgOPT.PGOPT['GXTYP'].find(type) > -1 and ('DX' in PgOPT.params or pgrec and pgrec['meta_link'] and pgrec['meta_link'] != 'N'):
             metacnt += PgMeta.record_meta_delete('W', dsid, wfile)
@@ -4498,6 +4488,7 @@ def delete_saved_files():
    bidx = chksize = reorder = scnt = ocnt = dcnt = 0
    PgArch.cache_group_info(ALLCNT, 0)
    PgOPT.validate_multiple_options(ALLCNT, ["ST", 'VI', 'QF', 'LC'])
+   if 'QF' in PgOPT.params: PgOPT.params['QF'] = PgArch.get_bid_numbers(PgOPT.params['QF'])
 
    if PgLOG.PGLOG['DSCHECK']:
       bidx = PgCMD.set_dscheck_fcount(ALLCNT, PgOPT.PGOPT['extlog'])
@@ -4550,7 +4541,7 @@ def delete_saved_files():
             continue
          bid = PgOPT.params['QF'][i] if 'QF' in PgOPT.params else pgrec['bid']
          if bid:
-            PgLOG.pglog(sfile + ": Saved file is Quasar backed up, add option -qf '' to force delete", PgOPT.PGOPT['errlog'])
+            PgLOG.pglog(sfile + ": Saved file is Quasar backed up, add option -qf 0 to force delete", PgOPT.PGOPT['errlog'])
             continue
 
       if sdel:

rda_python_dsarch/dsarch.py

@@ -2058,11 +2058,12 @@ class DsArch(PgArch, PgMeta):
 
    def set_dataset_info(self, include=None):
       """
-      Insert or update the dataset record in RDADB.
+      Update an existing dataset record in RDADB.
 
-      Reads dataset fields from params, builds an update/insert record, and
-      calls the appropriate database function.  When *include* is 'P', only
-      period-related fields are updated.
+      Reads dataset fields from params, builds an update record, and updates
+      the existing dataset record.  New datasets are created via the Metadata
+      Manager, not dsarch, so a missing dataset record is left unchanged.
+      When *include* is 'P', only period-related fields are updated.
 
       Args:
          include -- field subset selector string, or None for all fields
@@ -2071,35 +2072,24 @@ class DsArch(PgArch, PgMeta):
       dsid = self.params['DS']
       dcnd = "dsid = '{}'".format(dsid)
       self.pglog("Set {} info of {} ...".format(tname, dsid), self.WARNLG)
-      mcnt = acnt = pcnt = kcnt = 0
+      mcnt = pcnt = kcnt = 0
       fnames = self.get_field_keys(tname, include)
-      if fnames: # set dataset record
+      if fnames: # set dataset record; new datasets are created via the Metadata Manager, not dsarch
          pgrec = self.pgget(tname, self.get_string_fields(fnames, tname), dcnd, self.LGEREX)
          record = self.build_record(fnames, pgrec, tname, 0)
-         if record:
+         if record and pgrec:
             if 'backflag' in record and record['backflag'] == 'P': record['backflag'] = 'N'
             if 'locflag' in record and record['locflag'] in 'BR': record['locflag'] = 'G'
-            if pgrec:
-               record['date_change'] = self.curdate()
-               if self.pgupdt(tname, record, dcnd, self.LGEREX):
-                  mcnt += 1
-                  if 'use_rdadb' in record and re.search(r'^[PYW]$', record['use_rdadb']):
-                     self.params['WN'] = 6
-            else:
-               record['dsid'] = dsid
-               record['date_change'] = record['date_create'] = self.curdate()
-               if not record['use_rdadb']: record['use_rdadb'] = 'Y'
-               acnt += self.pgadd(tname, record, self.LGEREX)
-      if acnt == 0: pcnt = self.set_period_info(dcnd)   # set dsperiod record
+            record['date_change'] = self.curdate()
+            if self.pgupdt(tname, record, dcnd, self.LGEREX):
+               mcnt += 1
+      pcnt = self.set_period_info(dcnd)   # set dsperiod record
       kvalues = self.params['KV'] if 'KV' in self.params else []
       kcnt = self.set_keyvalues(dsid, kvalues)
-      if (pcnt + kcnt + mcnt + acnt) == 0:
+      if (pcnt + kcnt + mcnt) == 0:
          if not include: self.pglog("No change of dataset record for {}!".format(dsid), self.LOGWRN)
       else:
-         if acnt:
-            self.pglog("Dataset record added for {}!".format(dsid),  self.LOGWRN)
-         else:
-            self.pglog("Dataset record modified for {}!".format(dsid),  self.LOGWRN)
+         self.pglog("Dataset record modified for {}!".format(dsid),  self.LOGWRN)
          if pcnt + mcnt:
             self.reset_rdadb_version(dsid)
 
@@ -3634,6 +3624,7 @@ class DsArch(PgArch, PgMeta):
       reorder = metatotal = metacnt = dcnt = mcnt = ocnt = wcnt = 0
       self.cache_group_info(self.ALLCNT, 0)
       self.validate_multiple_options(self.ALLCNT, ["WT", 'VI', 'QF', 'LC'])
+      if 'QF' in self.params: self.params['QF'] = self.get_bid_numbers(self.params['QF'])
       if self.PGLOG['DSCHECK']:
          bidx = self.set_dscheck_fcount(self.ALLCNT, self.PGOPT['extlog'])
          if bidx > 0:
@@ -3681,7 +3672,7 @@ class DsArch(PgArch, PgMeta):
                continue
             bid = self.params['QF'][i] if 'QF' in self.params else pgrec['bid']
             if bid:
-               self.pglog(wfile + ": Web file is Quasar backed up, add option -qf '' to force delete", self.PGOPT['errlog'])
+               self.pglog(wfile + ": Web file is Quasar backed up, add option -qf 0 to force delete", self.PGOPT['errlog'])
                continue
             if self.PGOPT['GXTYP'].find(type) > -1 and ('DX' in self.params or pgrec and pgrec['meta_link'] and pgrec['meta_link'] != 'N'):
                metacnt += self.record_meta_delete('W', dsid, wfile)
@@ -4224,6 +4215,7 @@ class DsArch(PgArch, PgMeta):
       bidx = chksize = reorder = scnt = dcnt = 0
       self.cache_group_info(self.ALLCNT, 0)
       self.validate_multiple_options(self.ALLCNT, ["ST", 'VI', 'QF', 'LC'])
+      if 'QF' in self.params: self.params['QF'] = self.get_bid_numbers(self.params['QF'])
       if self.PGLOG['DSCHECK']:
          bidx = self.set_dscheck_fcount(self.ALLCNT, self.PGOPT['extlog'])
          if bidx > 0:
@@ -4260,7 +4252,7 @@ class DsArch(PgArch, PgMeta):
                continue
             bid = self.params['QF'][i] if 'QF' in self.params else pgrec['bid']
             if bid:
-               self.pglog(sfile + ": Saved file is Quasar backed up, add option -qf '' to force delete", self.PGOPT['errlog'])
+               self.pglog(sfile + ": Saved file is Quasar backed up, add option -qf 0 to force delete", self.PGOPT['errlog'])
                continue
          if sdel:
             afile = self.get_saved_path(i, self.params['SF'][i], 1, type)

rda_python_dsarch/dsarch.usg

@@ -53,13 +53,6 @@ perform the following major functions:
     GDEXDB
   - Regenerate filelist and main webpages on demand after dataset changes
 
-The dataset flag -UD (-UseDSARCH) must be set to at least 'Y' before
-'dsarch' can archive files or write to GDEXDB. This flag also controls
-file list publication: setting it to 'P' or 'W' publishes file lists for
-GDEX Server data files, making them visible in the dataset's user
-interface on the GDEX Web Server. See the -SD (-SetDataset) action and
-the -UD (-UseDSARCH) option for details.
-
 When a file is moved and its name or path changes, 'dsarch' records the
 new name as the primary entry in GDEXDB and retains the original as a
 linked alias. Both names resolve to the same file for usage tracking.
@@ -108,9 +101,12 @@ publishes the user guide as the 'latest' version at
 https://gdex-docs-dsarch.readthedocs.io, and creating a GitHub release
 there publishes it as the 'stable' version.
 
-This document first covers general 'dsarch' usage, then describes each
-Action option in detail, followed by Mode and Information (Info for
-short) options. Examples are provided throughout each section.
+The remainder of this document is organized as follows. Section 2 covers
+general usage and conventions. Section 3 describes Action options grouped
+by what they manipulate (dataset records, DOI/Version controls, groups,
+files, all-information, and webpages). Section 4 lists Mode options that
+modify how an action behaves. Section 5 lists Information options that
+pass values into an action.
 
 
 2 GENERAL DSARCH USAGE
@@ -119,59 +115,82 @@ short) options. Examples are provided throughout each section.
       or
   dsarch [-(IF|InputFile)] InputFileNames
 
-Brackets [] indicate optional elements. A pipe '|' within parentheses,
-as in (A|B), means either A or B may be used. Options fall into three
-categories:
-  Action options - specify the task to execute
-  Mode options   - modify how an action behaves
-  Info options   - supply values to the action
-
-Options may be given in short or long form (e.g., -DS or -Dataset). Some
-options have alias names; for example, -UseRDADB is an alias for -UD
-(-UseDSARCH). Option names are case-insensitive, but values following
-Info options are case-sensitive.
-
-Option -DS specifies the dataset number. It is listed separately because
-most actions require it. When -DS is the first argument after 'dsarch',
-the option name itself may be omitted — just supply the dataset number
-directly.
-
-Specify exactly one Action option per 'dsarch' invocation. Each action
-has its own set of required and optional Info options, and may accept
-specific Mode options that adjust its behavior.
-
-All options except -IF (-InputFile) may be given either on the command
-line or in input files. Input file names are specified via -IF and can
-only be supplied on the command line. See the -IF option description for
-details on how to format options in input files. One or more input files
-may be combined with command-line options. The -IF option name itself
-may be omitted when a single input file is given on the command line and
-all action and option information is contained within that file.
-
-Info options used with GET actions serve as query filters. Four special
-characters enable more precise filtering — they must be quoted or
-escaped on the command line to prevent shell interpretation:
-   '!'  - exclude matches; must appear immediately after the option name
-          (may need escaping as '\!' in some shells due to history
-          expansion)
-   '<'  - less-than comparison on the following value
-   '>'  - greater-than comparison on the following value
-   '<>' - range between two values
-
-Combining '!' and '<' as "'!' '<' OptionValue" expresses a 'greater than
-or equal to OptionValue' condition.
-
-The description of an individual option is shown when 'dsarch' is run as
+Notation:
+  []       - the enclosed element is optional.
+  (A|B)    - either A or B may be used (a short form and a long form).
+  -<OPT>   - OPT is an option name. Names are case-insensitive; values are not.
+
+Every dsarch invocation has at most one Action option, which selects the
+task to perform. Mode options change how the chosen action behaves. Info
+options carry the data the action needs (file names, group indices, dates,
+etc.). Each action documents which Info options are required and which are
+optional.
+
+Option -DS (-Dataset) supplies the dataset number. It is listed separately
+because most actions require it. When -DS is the first argument after
+'dsarch', the option name itself may be omitted — just supply the dataset
+number directly.
+
+Many options have an alias for convenience; for example, -Compress is an
+alias for -ZD (-ZipData). Both short and long forms are accepted, and
+aliases are noted with each option.
+
+2.1 Quick Start
+
+  Show the full document, paged through 'more':
+  dsarch
+
+  Show the description of a single option:
+  dsarch -h -AW
+
+  Retrieve a dataset record from GDEXDB:
+  dsarch d260001 -GD
+
+  Archive a local file as a Web file:
+  dsarch d260001 -AW -LF data.nc
+
+  Retrieve the Web file records for a dataset:
+  dsarch d260001 -GW
+
+2.2 Filters and Special Characters in Queries
+
+For Get-style actions (-GD, -GV, -GG, -GS, -GW, -GH, -GQ), Info options are
+interpreted as query filters. Four characters refine those filters; quote or
+escape them on the command line so the shell does not consume them:
+
+  '!'   - negate the match. Must appear immediately after the option name
+          (may need escaping as '\!' in some shells due to history expansion).
+  '<'   - less-than comparison against the next value.
+  '>'   - greater-than comparison against the next value.
+  '<>'  - range between the next two values (inclusive).
+
+The combination "'!' '<' value" expresses 'greater than or equal to value'.
+
+2.3 Input Files
+
+Every option except -IF (-InputFile) may be supplied either on the command
+line or in an input file. -IF is itself only valid on the command line. A
+single dsarch invocation may combine command-line options with one or more
+input files. If the only options are inside a single input file, the -IF
+prefix may be omitted. See the description of -IF in Section 5.2 for the
+input-file format (comments, action/mode markers, single-value assignments,
+and tabular multi-value assignments, including delimiter overrides).
+
+As a safeguard against operating on the wrong dataset, input file names must
+begin with the dataset number in the format 'dNNNNNN.*', where '*' matches
+one or more valid filename characters.
+
+2.4 Getting Help
 
   dsarch [Option] -(h|help) [Option]
 
-The description is shown for the option placed either before or after
--(h|help). If no option is given, or 'dsarch' is run without arguments,
-the full document is displayed using the UNIX 'more' utility. A hard
-copy of this document can be printed from the saved file, dsarch.usg,
-in the rda_python_dsarch Python package.
+The description of a single option is shown when -h (-help) is given with
+that option, placed either before or after -h. With no option, or when
+'dsarch' is run without arguments, the full document is displayed through
+the UNIX 'more' utility. A printable copy of this document is the file
+dsarch.usg installed under the python package rda_python_dsarch.
 
-#The online version of this document is available at
+#The online HTML version of this document is available at
 #https://gdex-docs-dsarch.readthedocs.io
 
 
@@ -182,10 +201,6 @@ actions perform a single task; others bundle multiple tasks together and
 may trigger additional steps when certain Mode options are present. Only
 one Action option may be specified per execution.
 
-Write actions require the -UD (-UseDSARCH) flag to be set to 'Y', 'I',
-'P', or 'W' for the target dataset before they can modify GDEXDB. Read
-actions have no such requirement.
-
 Actions are grouped into seven categories based on the information they
 handle:
      Dataset Actions - create, modify and retrieve dataset information
@@ -219,7 +234,6 @@ handle:
   periods.
 
   dsarch [-(DS|Dataset)] dNNNNNN [-](SD|SetDataset) [Mode Options]
-         [-(UD|UseDSARCH) UseDSARCHFlag]   # Y, P, W, I, or N
          [-(LC|Location) AccessLocationFlag]   # C - CGD, G - Glade, O - bOreas
          [-(BF|BackupFlag) QuasarBackupFlag]   # B - Backup, D - Backup & Drdata
          [-(DA|AccessFlag) DataAccessFlags]    # B - Both, C - Complete, F - Faceted, or N - No
@@ -257,20 +271,21 @@ handle:
                           dataset level
    -(WN|WithFileNumber) - re-evaluates and resets file counts
 
-  Dataset numbers are normally created via the Metadata Manager. Action
-  -SD modifies the dataset record and any associated group data
-  periods. Data periods for groups can be modified in 'dsarch', but
-  must be created or removed through Metadata Manager.
+  Dataset numbers are created via the Metadata Manager, not 'dsarch'.
+  Action -SD only modifies an existing dataset record and its associated
+  group data periods; if no dataset record exists, -SD makes no change to
+  it. Data periods for groups can be modified in 'dsarch', but the groups
+  themselves must be created or removed through the Metadata Manager.
 
   The web file access location flag is set via -LC (-Location). The
   default is 'G' (Glade Disk) when any web data files exist. The default
   becomes 'O' if all web files reside on bOreas, or 'C' if all are at
   the CGD data path.
 
-  For example, to set the UseDSARCH flag, reset file counts and data
-  size, and set the beginning data date for dataset d744004:
+  For example, to reset file counts and data size, and set the
+  beginning data date for dataset d744004:
 
-  dsarch d744004 SD -WN -UD Y -BD 1999-07-01
+  dsarch d744004 SD -WN -BD 1999-07-01
 
 3.1.2 Get Dataset Information
   -GD or -GetDataset, reads and displays dataset record fields from
@@ -289,7 +304,7 @@ handle:
   -(WN|WithFileNumber) - gathers and displays Saved/Web file counts
 
   Use -FN (-FieldNames) to select which dataset fields to include.
-  Defaults to 'SWFULQ'. Use -FN ALL to retrieve every available field.
+  Defaults to 'SWFLQA'. Use -FN ALL to retrieve every available field.
 
   Valid dataset field names and their corresponding Info options:
 
@@ -299,7 +314,6 @@ handle:
   H      -(WH|WebHome)         path for the web data home directory
   W      -(WP|WebPath)         path relative to web home directory
   F      -(DF|DataFormat)      default data content format
-  U      -(UD|UseDSARCH)       use DSARCH flag
   L      -(LC|Location)        Online web file access location flags
   Q      -(BF|BackupFlag)      Quasar Backup flags
   A      -(DA|DataAccessFlag)  dataset data file list access flags
@@ -331,7 +345,6 @@ SavedPath<=>
 WebPath<=>
 Location<=>G
 DataFormat<=>
-UseDSARCH<=>P
 GroupLevel<=>3
 FileLimit<=>500
 ButtonLimit<=>2
@@ -2008,18 +2021,6 @@ They come in two forms:
   when running 'dsarch' as a PBS batch job. Quote the value on the
   command line, e.g., -QS '-l walltime=12:00:00'.
 
-  -UD or -UseDSARCH (Alias: -UseGDEXDB), the gating flag that
-  controls 'dsarch' access to a dataset. Set via -SD (-SetDataset).
-  Values:
-    'N' - disabled (default; blocks all 'dsarch' writes)
-    'Y' - enabled for modification
-    'I' - enabled for internal users only
-    'P' - enabled and file lists are published publicly
-    'W' - file list publication only
-
-  Any value except 'N' must be set before 'dsarch' can write to
-  GDEXDB.
-
   -VS or -ValidSize, the minimum acceptable file size (in bytes) for
   archiving. Files smaller than this threshold are rejected.
   Defaults to 100.
@@ -2260,7 +2261,9 @@ They come in two forms:
   parent group for a subgroup. Groups can be nested to any depth.
 
   -QF or -QuasarFile, the name of the Quasar backup (tar) file,
-  required for -AQ (-ArchiveQuasarFile).
+  required for -AQ (-ArchiveQuasarFile).  Give -QF 0 with -DL
+  (-DeleteFile) to force delete a Web or Saved file that is Quasar
+  backed up.
 
   -QT or -QuasarFileType (Alias: -QuasarType|-BackupType), the
   backup scope: 'B' (backup only) or 'D' (backup plus disaster

rda_python_dsarch/pg_arch.py

@@ -148,7 +148,6 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          'ON' : [1, 'OrderNames',      0],
          'PO' : [1, 'PatternOffset',  16],
          'QS' : [1, 'QsubOptions',     1],
-         'UD' : [1, 'UseDSARCH',       0,  'YNIPW'],  # Internal, Public, Web only, Y - ready for dsarch 
          'VS' : [1, 'ValidSize',      17],  # default to self.PGLOG['MINSIZE']
          'WI' : [1, 'WaitInternval',   1],
          'AF' : [2, 'ArchiveFormat', 1],
@@ -192,7 +191,7 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          'OG' : [2, 'OriginGroup',   1],
          'OT' : [2, 'OriginType',    1],
          'PI' : [2, 'ParentIndex',  17],
-         'QF' : [2, 'QuasarFile',    0],
+         'QF' : [2, 'QuasarFile',    0, ''],
          'QT' : [2, 'QuasarFileType',  129, 'BD'],
          'RF' : [2, 'OriginFile',    0],
          'SF' : [2, 'SavedFile',     0],
@@ -272,7 +271,6 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          'TS' : ['ToSavedFile', 'MovedToSaved'],
          'TW' : ['ToWebFile', 'MovedToWeb'],
          'UC' : ['UpdateCacheNumber'],
-         'UD' : ['UseRDADB'],
          'HD' : ['UpdateHTML', 'GenerateHTML'],
          'UZ' : ['Uncompress', 'UncompressData', 'Unzip'],
          'WC' : ['ValidateChecksum', "WithMD5", "ValidateMD5"],
@@ -293,7 +291,6 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          'H' : ['WH', "webhome",      1],
          'W' : ['WP', "webpath",      1],
          'F' : ['DF', "data_format",  1],
-         'U' : ['UD', "use_rdadb",    1],
          'L' : ['LC', "locflag",      1],
          'Q' : ['BF', "backflag",     1],
          'A' : ['DA', "accessflag",   1],
@@ -416,7 +413,7 @@ class PgArch(PgOPT, PgCMD, PgSplit):
       # global info to be used by the whole application
       self.PGOPT['MSET']  = "SA"
       #default fields for getting info
-      self.PGOPT['dataset'] = "SWFULQA"
+      self.PGOPT['dataset'] = "SWFLQA"
       self.PGOPT['dsperiod'] = "GJKXY"
       self.PGOPT['dsgroup'] = "IGXTPQASW"
       self.PGOPT['wfile'] = "FTIVMNLHPS"
@@ -424,10 +421,9 @@ class PgArch(PgOPT, PgCMD, PgSplit):
       self.PGOPT['bfile'] = "FNMTHS"
       self.PGOPT['hfile'] = 'FMNLTHPSU'
       self.PGOPT['dsvrsn'] = "VIEDSJX"
-      self.PGOPT['UACTS'] = (self.OPTS['AQ'][0]|self.OPTS['SD'][0]|self.OPTS['DL'][0])
-      
+
       #all fields for getting info
-      self.PGOPT['dsall'] = "TSHWFULQAVCBMPIDNGJKXYIJKXY"   # include 'pdall'
+      self.PGOPT['dsall'] = "TSHWFLQAVCBMPIDNGJKXYIJKXY"   # include 'pdall'
       self.PGOPT['pdall'] = "GJKXY"
       self.PGOPT['gpall'] = "IGXTRQAPSWMDN"
       self.PGOPT['wfall'] = "FTCIXVMNOBQLHPSJKAED"
@@ -506,7 +502,7 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          "Miss Saved file types per -ST(-SavedFileType)",
          "Cannot Cross Copy/Move (-XC/-XM) Saved Files",
          "14",
-         "Miss Use-RDADB flag, ('Y', 'P', 'W', 'I'), per -UD(-UseRDADB) for ",
+         "15",
          "16",
          "miss Saved file names per -SF(-SavedFile)",
          "Miss Version Control Index per -VI(-VersionIndex)",
@@ -684,13 +680,8 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          self.validate_versions()
       elif acts == self.OPTS['UC'][0] or acts == self.OPTS['UW'][0]:
          if 'DS' not in self.params: erridx = 4
-      if erridx < 0:
-         if(self.OPTS[cact][2] > 0 and acts&self.PGOPT['UACTS'] == 0 and
-            self.use_rdadb(self.params['DS'], self.PGOPT['extlog']) == 'N' and
-            ('UD' not in self.params or self.params['UD'] == 'N')):
-            erridx = 15
-            errmsg[erridx] += self.params['DS']
       if erridx >= 0: self.action_error(errmsg[erridx], cact)
+      self.validate_dataset()   # error out if the dataset does not exist in RDADB
       self.set_uid("dsarch")   # set uid before any action
       if 'VS' in self.params: self.PGLOG['MINSIZE'] = self.params['VS']   # minimal size for a file to be valid for archive
       self.PGLOG['RSOptions'] = " -R -S" if 'RS' in self.params else ''

{rda_python_dsarch-3.0.3.dist-info → rda_python_dsarch-3.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.3
+Version: 3.0.6
 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-3.0.6.dist-info/RECORD

@@ -0,0 +1,14 @@
+rda_python_dsarch/PgArch.py,sha256=_hfBFyft9rSC35QBIbtQRkF3TQE7tuT7Dz-B-KmVsVU,58922
+rda_python_dsarch/PgMeta.py,sha256=FV4GytgnJK00FUlyM6iHqpNd7-XTVHO1j5tZtcLTWgY,26845
+rda_python_dsarch/__init__.py,sha256=-ympZMoYfvP0lxSq06GWQemQlj4HwV9tm1JNxKpSU90,812
+rda_python_dsarch/ds_arch.py,sha256=n8fYdSy9cTqzPwJuHt8haIPAFD_n76GB20AApGWTkDY,233513
+rda_python_dsarch/dsarch.py,sha256=PWwe76cb8iOQci8LO0tpNQ0wtULxawsPV7-JkY98Mtw,254884
+rda_python_dsarch/dsarch.usg,sha256=LpteXfUe9RBSbmM3HputbtZjEEyUSKnYvOfphH0UQrA,106590
+rda_python_dsarch/pg_arch.py,sha256=-HD-CynFzvcBsL9w6EN-4O5RqdXvspbRUbNzs6njSaQ,80494
+rda_python_dsarch/pg_meta.py,sha256=FFEkphGAT--66zvMNDPfiFG4nZQpXed_yVGMARdZb-o,46981
+rda_python_dsarch-3.0.6.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_dsarch-3.0.6.dist-info/METADATA,sha256=6mQmnKFsQ0dRC2dcdaSQNtGP8fyLrTDp2nL5J1HEiI0,7165
+rda_python_dsarch-3.0.6.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+rda_python_dsarch-3.0.6.dist-info/entry_points.txt,sha256=BA1iRAFIZExG0656Ri9f-_OKlSK31CuABWPQSsA9MsI,64
+rda_python_dsarch-3.0.6.dist-info/top_level.txt,sha256=-vwcMgUXbBdHscvAKB3De9zKac3m_s_FaKIdApP1FGY,18
+rda_python_dsarch-3.0.6.dist-info/RECORD,,

{rda_python_dsarch-3.0.3.dist-info → rda_python_dsarch-3.0.6.dist-info}/WHEEL

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

rda_python_dsarch-3.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=Y-s3WV6vKvLYuMy6oy0FB9DYNVaiEaSjZVJYBMVlD_8,812
-rda_python_dsarch/ds_arch.py,sha256=6bR0y6_rhIXyvbuYd-oZfL1YcaHhWBkojjzYz1yCrVg,233810
-rda_python_dsarch/dsarch.py,sha256=wQZS-mI4vyc7GDKOMl--_wQejx4_Wa77hegF_9deZX8,255105
-rda_python_dsarch/dsarch.usg,sha256=GBjaGaXFislaJO-s8lxcNdddJ7A5NUNreT2xgiP-Emg,106789
-rda_python_dsarch/pg_arch.py,sha256=0mZGlQT9ecJr-92dloXDNtwF8EnPnY76IGLksqYsyYo,81057
-rda_python_dsarch/pg_meta.py,sha256=FFEkphGAT--66zvMNDPfiFG4nZQpXed_yVGMARdZb-o,46981
-rda_python_dsarch-3.0.3.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_dsarch-3.0.3.dist-info/METADATA,sha256=eXobD0DFxXfPHuneCSPb_uEKSJZYzZUMPtnbyKMdwtY,7165
-rda_python_dsarch-3.0.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rda_python_dsarch-3.0.3.dist-info/entry_points.txt,sha256=BA1iRAFIZExG0656Ri9f-_OKlSK31CuABWPQSsA9MsI,64
-rda_python_dsarch-3.0.3.dist-info/top_level.txt,sha256=-vwcMgUXbBdHscvAKB3De9zKac3m_s_FaKIdApP1FGY,18
-rda_python_dsarch-3.0.3.dist-info/RECORD,,