rda-python-dsarch 3.0.5__tar.gz → 3.0.6__tar.gz

{rda_python_dsarch-3.0.5/src/rda_python_dsarch.egg-info → rda_python_dsarch-3.0.6}/PKG-INFO

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

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

{rda_python_dsarch-3.0.5 → rda_python_dsarch-3.0.6}/src/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],
 
@@ -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-3.0.5 → rda_python_dsarch-3.0.6}/src/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)
 

{rda_python_dsarch-3.0.5 → rda_python_dsarch-3.0.6}/src/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)
 

{rda_python_dsarch-3.0.5 → rda_python_dsarch-3.0.6}/src/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.
@@ -138,8 +131,8 @@ 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, -UseRDADB is an
-alias for -UD (-UseDSARCH). Both short and long forms are accepted, and
+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
@@ -153,9 +146,6 @@ aliases are noted with each option.
   Retrieve a dataset record from GDEXDB:
   dsarch d260001 -GD
 
-  Set the UseDSARCH flag so the dataset can be archived:
-  dsarch d260001 -SD -UD Y
-
   Archive a local file as a Web file:
   dsarch d260001 -AW -LF data.nc
 
@@ -211,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
@@ -248,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
@@ -286,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
@@ -318,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:
 
@@ -328,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
@@ -360,7 +345,6 @@ SavedPath<=>
 WebPath<=>
 Location<=>G
 DataFormat<=>
-UseDSARCH<=>P
 GroupLevel<=>3
 FileLimit<=>500
 ButtonLimit<=>2
@@ -2037,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.

{rda_python_dsarch-3.0.5 → rda_python_dsarch-3.0.6}/src/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],
@@ -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.5 → rda_python_dsarch-3.0.6/src/rda_python_dsarch.egg-info}/PKG-INFO

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