rda-python-dbms 2.0.0__tar.gz → 2.0.2__tar.gz

{rda_python_dbms-2.0.0 → rda_python_dbms-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dbms
-Version: 2.0.0
+Version: 2.0.2
 Summary: RDA Python Package to manage PostreSQL databases
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dbms

{rda_python_dbms-2.0.0 → rda_python_dbms-2.0.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dbms"
-version = "2.0.0"
+version = "2.0.2"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_dbms-2.0.0 → rda_python_dbms-2.0.2}/src/rda_python_dbms/pgchksum.py

@@ -13,11 +13,10 @@
 import sys
 import re
 import time
-from rda_python_common.pg_file import PgFile
 from rda_python_common.pg_cmd import PgCMD
 from rda_python_common.pg_split import PgSplit
 
-class PgChksum(PgFile, PgCMD, PgSplit):
+class PgChksum(PgCMD, PgSplit):
 
    def __init__(self):
       super().__init__()  # initialize parent class
@@ -86,7 +85,7 @@ class PgChksum(PgFile, PgCMD, PgSplit):
          print("                [-k SkipCount] [-o r|s] [-s Specialists]")
          print("  -b - background process and no screen output")
          print("  -c - File count to re-evaluate checksum; for all gathered files if not specified")
-         print("  -d - delayed mode background/batch processes on RDA machines/DAV SLURM nodes")
+         print("  -d - delayed mode background/batch processes on RDA machines/DAV PBS nodes")
          print("  -f - Re-evaluate the specify File names only")
          print("  -i - Dataset IDs the files belong; for all files if not specified")
          print("  -k - skip the given file count to re-evaluate checksum")

{rda_python_dbms-2.0.0 → rda_python_dbms-2.0.2}/src/rda_python_dbms/pgddl.py

@@ -67,12 +67,13 @@ class PgDDL(PgDDLLib):
          'u' : 'lnname',
          'w' : 'pwname',
       }
+      self.tablenames = None
 
    # function to read parameters
    def read_parameters(self):
       option = 't'
       actopt = False
-      tablenames = action = None
+      action = None
       dbopt = getall = False
       argv = sys.argv[1:]
       for arg in argv:
@@ -135,23 +136,23 @@ class PgDDL(PgDDLLib):
          self.default_scinfo(self.DBINFO['dbname'], self.DBINFO['scname'], self.DBINFO['dbhost'],
                               self.DBINFO['lnname'], self.DBINFO['pwname'], self.DBINFO['dbport'])   
       if self.VALUES['TBL']:
-         tablenames = self.VALUES['TBL']
+         self.tablenames = self.VALUES['TBL']
       elif getall:
-         tablenames = self.allschematables();         # action on all tables
-      if not (tablenames and action): self.show_usage('pgddl')
+         self.tablenames = self.allschematables();         # action on all tables
+      if not (self.tablenames and action): self.show_usage('pgddl')
       self.PGLOG['LOGFILE'] = "pgddl.log"
       self.cmdlog("pgddl {}".format(' '.join(argv)))
 
-      # process all or given tables to add/drop table/pkey/index/reference/field
-      def start_actions(self):
-         act = self.PGACT['TBL'][0]
-         if act: self.process_tables(tablenames, act, 'TBL')
-         for opt in self.PGACT:
-            act = self.PGACT[opt][0]
-            if opt == 'TBL' or not act: continue
-            names = self.VALUES[opt] if opt in self.VALUES and self.VALUES[opt] else None
-            self.process_tables(tablenames, act, opt, names)
-         self.cmdlog()
+   # process all or given tables to add/drop table/pkey/index/reference/field
+   def start_actions(self):
+      act = self.PGACT['TBL'][0]
+      if act: self.process_tables(self.tablenames, act, 'TBL')
+      for opt in self.PGACT:
+         act = self.PGACT[opt][0]
+         if opt == 'TBL' or not act: continue
+         names = self.VALUES[opt] if opt in self.VALUES and self.VALUES[opt] else None
+         self.process_tables(self.tablenames, act, opt, names)
+      self.cmdlog()
 
 # main function to excecute this script
 def main():

{rda_python_dbms-2.0.0 → rda_python_dbms-2.0.2}/src/rda_python_dbms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dbms
-Version: 2.0.0
+Version: 2.0.2
 Summary: RDA Python Package to manage PostreSQL databases
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dbms