rda-python-dsarch 3.0.15__tar.gz → 3.0.17__tar.gz

{rda_python_dsarch-3.0.15/src/rda_python_dsarch.egg-info → rda_python_dsarch-3.0.17}/PKG-INFO

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

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

{rda_python_dsarch-3.0.15 → rda_python_dsarch-3.0.17}/src/rda_python_dsarch/dsarch.py

@@ -476,7 +476,7 @@ class DsArch(PgArch, PgMeta):
                   if pgrec and chksum and pgrec['checksum'] and pgrec['checksum'] == chksum:
                      self.pglog("Web-{}: Same-Checksum ARCHIVED at {}:{}".format(winfo, info['date_modified'], info['time_modified']), self.PGOPT['emllog'])
                      warch = 0
-                  elif info['data_size'] == lsize:
+                  elif not override and info['data_size'] == lsize:
                      self.pglog("Web-{}: Same-Size ARCHIVED at {}:{}".format(winfo, info['date_modified'], info['time_modified']), self.PGOPT['wrnlog'])
                      warch = 0
                   elif vsnctl and not override:
@@ -495,7 +495,7 @@ class DsArch(PgArch, PgMeta):
                   if pgrec and chksum and pgrec['checksum'] and pgrec['checksum'] == chksum:
                      self.pglog("Object-{}-{}: Same-Checksum ARCHIVED at {}:{}".format(bucket, ofile, info['date_modified'], info['time_modified']), self.PGOPT['emllog'])
                      oarch = 0
-                  elif info['data_size'] == lsize:
+                  elif not override and info['data_size'] == lsize:
                      self.pglog("Object-{}-{}: Same-Size ARCHIVED at {}:{}".format(bucket, ofile, info['date_modified'], info['time_modified']), self.PGOPT['wrnlog'])
                      oarch = 0
                   elif vsnctl and not override:
@@ -714,7 +714,7 @@ class DsArch(PgArch, PgMeta):
                   if pgrec and chksum and pgrec['checksum'] and pgrec['checksum'] == chksum:
                      self.pglog("Object-{}-{}: Same-Checksum ARCHIVED at {}:{}".format(bucket, ofile, info['date_modified'], info['time_modified']), self.PGOPT['emllog'])
                      oarch = 0
-                  elif info['data_size'] == lsize:
+                  elif not override and info['data_size'] == lsize:
                      self.pglog("Object-{}-{}: Same-Size ARCHIVED at {}:{}".format(bucket, ofile, info['date_modified'], info['time_modified']), self.PGOPT['wrnlog'])
                      oarch = 0
                   else:
@@ -901,7 +901,7 @@ class DsArch(PgArch, PgMeta):
                   if pgrec and chksum and pgrec['checksum'] and pgrec['checksum'] == chksum:
                      self.pglog("Saved-{}: Same-Checksum ARCHIVED at {}:{}".format(sinfo, info['date_modified'], info['time_modified']), self.PGOPT['emllog'])
                      sarch = 0
-                  elif info['data_size'] == lsize:
+                  elif not override and info['data_size'] == lsize:
                      self.pglog("Saved-{}: Same-Size ARCHIVED at {}:{}".format(sinfo, info['date_modified'], info['time_modified']), self.PGOPT['wrnlog'])
                      sarch = 0
                   elif vsnctl and not override:
@@ -2047,9 +2047,37 @@ class DsArch(PgArch, PgMeta):
          self.print_row_format(pgrec, fnames, hash)
       self.view_keyvalues(dsid, kvalues, getkeys)
       if fnames and 'PE' in self.params: self.get_period_info()
+      if 'SO' in self.params: self.get_owner_info(dsid)
       if 'WN' in self.params or 'WS' in self.params: self.view_filenumber(dsid, 0)
       return 1   # get one dataset record
 
+   def get_owner_info(self, dsid):
+      """
+      Display the specialists who own a dataset.
+
+      Joins dsowner with dssgrp to list each owner's login name, priority
+      (1 = primary specialist) and name, ordered by priority.  Lines are
+      written as comments so the output can still be fed back via -IF.
+
+      Args:
+         dsid -- dataset ID string
+      """
+      tjoin = "dsowner LEFT JOIN dssgrp ON specialist = logname"
+      pgrecs = self.pgmget(tjoin, "specialist, priority, fstname, lstname",
+                           "dsid = '{}' ORDER BY priority, specialist".format(dsid), self.LGEREX)
+      cnt = len(pgrecs['specialist']) if pgrecs else 0
+      if not cnt:
+         self.OUTPUT.write("#Owner{}NONE\n".format(self.params['ES']))
+         return self.pglog("No owner found for {} in dsowner".format(dsid), self.LOGWRN)
+      dv = self.params['DV']
+      self.OUTPUT.write("#Owner{0}Priority{0}Name{0}\n".format(dv))
+      for i in range(cnt):
+         name = ' '.join(n for n in (pgrecs['fstname'][i], pgrecs['lstname'][i]) if n)
+         if not name: name = 'Not in dssgrp'
+         self.OUTPUT.write("#{1}{0}{2}{0}{3}{0}\n".format(dv, pgrecs['specialist'][i], pgrecs['priority'][i], name))
+      s = 's' if cnt > 1 else ''
+      self.pglog("{} owner record{} retrieved for {}".format(cnt, s, dsid), self.LOGWRN)
+
    def get_period_info(self):
       """
       Retrieve and display dataset time-period records from RDADB.

{rda_python_dsarch-3.0.15 → rda_python_dsarch-3.0.17}/src/rda_python_dsarch/dsarch.usg

@@ -301,6 +301,8 @@ handle:
     -(FO|FormatOutput) - formats each column to a uniform fixed width
       -(PE|ShowPeriod) - includes associated period information for the
                          dataset and any groups
+       -(SO|ShowOwner) - includes the dataset owners (specialists) and
+                         their priorities, 1 for the primary specialist
   -(WN|WithFileNumber) - gathers and displays Saved/Web file counts
 
   Use -FN (-FieldNames) to select which dataset fields to include.
@@ -1247,7 +1249,8 @@ IMMA_2.4_2007.tar<:>37<:>IMMA<:>Z.TAR<:>D<:>656820224<:>
        -(NE|NoEmail) - suppresses email notification on failure
         -(NT|NoTrim) - skips trimming of spaces and comments from input
                        values, speeding up input file processing
- -(OE|OverrideExist) - overwrites existing Saved files
+ -(OE|OverrideExist) - overwrites existing Saved files, even ones of the
+                       same size
     -(RO|ResetOrder) - resets display order indices to match the order
                        files are given per -SF. Alternatively, use -ON
                        (-OrderNames) to reorder all files in the dataset
@@ -1345,7 +1348,8 @@ IMMA_2.4_2007.tar<:>37<:>IMMA<:>Z.TAR<:>D<:>656820224<:>
        -(NE|NoEmail) - suppresses email notification on failure
         -(NT|NoTrim) - skips trimming of spaces and comments from input
                        values, speeding up input file processing
- -(OE|OverrideExist) - overwrites existing Web files
+ -(OE|OverrideExist) - overwrites existing Web files, even ones of the
+                       same size
     -(RO|ResetOrder) - resets display order indices to match the order
                        files are given per -WF. Alternatively, use -ON
                        (-OrderNames) to reorder all files in the dataset
@@ -1436,7 +1440,8 @@ IMMA_2.4_2007.tar<:>37<:>IMMA<:>Z.TAR<:>D<:>656820224<:>
        -(NE|NoEmail) - suppresses email notification on failure
         -(NT|NoTrim) - skips trimming of spaces and comments from input
                        values, speeding up input file processing
- -(OE|OverrideExist) - overwrites existing Help files
+ -(OE|OverrideExist) - overwrites existing Help files, even ones of the
+                       same size
     -(RO|ResetOrder) - resets display order indices to match the order
                        files are given per -HF. Alternatively, use -ON
                        (-OrderNames) to reorder all files in the dataset
@@ -1889,6 +1894,12 @@ behavior.
   the GDEX Server and stores them in GDEXDB for integrity
   verification.
 
+  -SO or -ShowOwner (Alias: -ShowOwners|-ShowSpecialist|-ShowSpecialists),
+  adds the dataset owners from dsowner to the output of -GD
+  (-GetDataset): login name, priority (1 = primary specialist) and
+  name. The lines are written as comments starting with '#', so the
+  output can still be read back with -IF.
+
   -TO or -TarOnly, builds the Quasar tar file locally without
   uploading it to the Globus Quasar Server. Useful for testing. Used
   with -AQ.

{rda_python_dsarch-3.0.15 → rda_python_dsarch-3.0.17}/src/rda_python_dsarch/pg_arch.py

@@ -121,6 +121,7 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          'RS' : [0, 'GXRSOptions',   3],
          'RT' : [0, 'ResetTIndex',   3],
          'SC' : [0, 'SetChecksum',   2],
+         'SO' : [0, 'ShowOwner',     0],
          'TO' : [0, 'TarOnly',       1],
          'TS' : [0, 'ToSaved',       2],
          'TT' : [0, 'TotalSummary',  0],
@@ -265,6 +266,7 @@ class PgArch(PgOPT, PgCMD, PgSplit):
          'RQ' : ['RestoreQuasar', 'RestoreBackupFile', 'RestoreBackup'],
          'RT' : ['ResetTopGroup'],
          'SH' : ['SetHelp'],
+         'SO' : ['ShowOwners', 'ShowSpecialist', 'ShowSpecialists'],
          'SQ' : ['SetQuasar', 'SetBackupFile', 'SetBackup'],
          'SS' : ['SetSaved'],
          'ST' : ['SavedType', 'SavedArchiveType'],

{rda_python_dsarch-3.0.15 → rda_python_dsarch-3.0.17/src/rda_python_dsarch.egg-info}/PKG-INFO

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