rda-python-dbms 2.0.6__py3-none-any.whl → 2.0.7__py3-none-any.whl

rda_python_dbms/pgchksum.py

@@ -176,7 +176,7 @@ class PgChksum(PgCMD, PgSplit):
    # get the checksum filelist for wfile
    def get_checksum_wfilelist(self):
       self.PVALS['TYPE'] = "Web"
-      self.PVALS['BUCKET'] = 'rda-data'
+      self.PVALS['BUCKET'] = 'gdex-data'
       flds = "wid, wfile, type, locflag, data_size, checksum, date_modified, time_modified"
       if self.PGSUM['f']:
          pgrecs = self.pgmhget('wfile', 'wid, dsid', {'wfile' : self.PGSUM['f']})
@@ -211,11 +211,15 @@ class PgChksum(PgCMD, PgSplit):
          cnt = len(pgrecs['wid']) if pgrecs else 0
          wfrecs = {}
          if cnt > 0:
+            tmpcnt = 0
             for i in range(cnt):
                dsid = pgrecs['dsid'][i]
                pgrec = self.pgget_wfile(dsid, flds, 'wid = {}'.format(pgrecs['wid'][i]))
-               pgrec['dsid'] = dsid
-               self.addrecord(wfrecs, pgrec, i)
+               if pgrec:
+                  pgrec['dsid'] = dsid
+                  self.addrecord(wfrecs, pgrec, tmpcnt)
+                  tmpcnt += 1
+            cnt = tmpcnt
       if cnt > 0:
          if fcnt == 0 or fcnt > cnt: self.PGSUM['c'] = cnt
          self.PGSUM['f'] = wfrecs
@@ -226,7 +230,7 @@ class PgChksum(PgCMD, PgSplit):
    # get the checksum filelist for sfile
    def get_checksum_sfilelist(self):
       self.PVALS['TYPE'] = "Saved"
-      self.PVALS['BUCKET'] = 'rda-decsdata'
+      self.PVALS['BUCKET'] = 'gdex-decsdata'
       flds = "sid, sfile, dsid, type, locflag, data_size, checksum, date_modified, time_modified"
       hcnd = {}
       fcnt = self.PGSUM['c']
@@ -331,7 +335,7 @@ class PgChksum(PgCMD, PgSplit):
          locflag = pgrec['locflag']
          if locflag == 'O':
             fname = "{}/{}".format(pgrec['dsid'], pgrec['wfile'])
-            self.evaluate_object_file(fname, pgrec, 'rda-data', cnts)
+            self.evaluate_object_file(fname, pgrec, self.PVALS['BUCKET'], cnts)
          else:
             fname = pgrec['wfile']
             if not re.match(r'^/', fname):
@@ -348,7 +352,7 @@ class PgChksum(PgCMD, PgSplit):
          locflag = pgrec['locflag']
          if locflag == 'O':
             fname = "{}/{}".format(pgrec['dsid'], pgrec['sfile'])
-            self.evaluate_object_file(fname, pgrec, 'rda-decsdata', cnts)
+            self.evaluate_object_file(fname, pgrec, self.PVALS['BUCKET'], cnts)
          else:
             fname = pgrec['sfile']
             if not re.match(r'^/', fname):

{rda_python_dbms-2.0.6.dist-info → rda_python_dbms-2.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dbms
-Version: 2.0.6
+Version: 2.0.7
 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.6.dist-info → rda_python_dbms-2.0.7.dist-info}/RECORD

@@ -10,7 +10,7 @@ rda_python_dbms/pg_ddllib.py,sha256=-zawllfUCe7QZNvza-u5TAYKP4yilC9K6TetHhoGenU,
 rda_python_dbms/pg_schema.py,sha256=Vsf5fKENYIOgMKE3yS0TkXhg-aeHZ2nYzpvltFAcdFY,5520
 rda_python_dbms/pg_seq.py,sha256=wNxqsyIjcTplJErPirZ-VkZ8HS4mgQUwPz8Xwd12kYA,4914
 rda_python_dbms/pgbackup.py,sha256=8LaRE7SeRT1hq0_oUby9lcjHSjKZI0YC_jXqtT5LNRo,4248
-rda_python_dbms/pgchksum.py,sha256=6B_FpHpY9iChIONsbwaZO_Uzk-1ala134-8QCg3hFek,21670
+rda_python_dbms/pgchksum.py,sha256=8jfBncptxp57Gr2t66Kk9MFt5Z_aXfozOGZPaohKGwM,21802
 rda_python_dbms/pgcmptables.py,sha256=LQ4KK4JuQs2z3nBdINWYgyiGu2MF9RZjS5_cAktbs6k,47123
 rda_python_dbms/pgdbdump.py,sha256=vM-J3VfEDTXD97OV0Ke3BJzNiXxuMQS0Ut1SxkqujkU,3170
 rda_python_dbms/pgdbrestore.py,sha256=aL1cfUQcNFlLCHBCGP3FPRc8biJfTxftq9lm_Ou8KHA,3108
@@ -954,9 +954,9 @@ rda_python_dbms/tables/obsua/wind_5v2_0.json,sha256=NehMFE-GMNlD5Bh_fiacfSOmZWkr
 rda_python_dbms/tables/obsua/wind_60v2_0.json,sha256=jOyQgD5ph7YBMuQfvYz1Ln6X_-_Vdhl36HBexOHZ1dA,1067
 rda_python_dbms/tables/obsua/wind_8v2_0.json,sha256=5wtCThmFeOyiAGH_Qv3_jrXjhjo9b87ehlpI9QQY2SM,1064
 rda_python_dbms/tables/obsua/wind_9v2_0.json,sha256=7OKFUicOn15LL_WuF1VE_L8DjxsHmRP4uBnopuMIeTg,1064
-rda_python_dbms-2.0.6.dist-info/licenses/LICENSE,sha256=Uky6fiiVw7cakFVRtVpzg-mvqOQ-WcA_H8lHqhPRg58,1101
-rda_python_dbms-2.0.6.dist-info/METADATA,sha256=YCh1izP8qpeuqP_Yzss3wMjPMDl-xff7ketsaYxoqLM,617
-rda_python_dbms-2.0.6.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-rda_python_dbms-2.0.6.dist-info/entry_points.txt,sha256=iti6iZS2OEeBqO5aHlWeMFcbuwN_2assidP0qeSkQ6E,346
-rda_python_dbms-2.0.6.dist-info/top_level.txt,sha256=4T1ShNUMyiqmwDIuDL7pDOm_S-6zWWW3Vy6OdAzYA4c,16
-rda_python_dbms-2.0.6.dist-info/RECORD,,
+rda_python_dbms-2.0.7.dist-info/licenses/LICENSE,sha256=Uky6fiiVw7cakFVRtVpzg-mvqOQ-WcA_H8lHqhPRg58,1101
+rda_python_dbms-2.0.7.dist-info/METADATA,sha256=Rs9LOGe7lwIOFKICQ6HA79ndm_mu_5d73Z_MuyUQoMg,617
+rda_python_dbms-2.0.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rda_python_dbms-2.0.7.dist-info/entry_points.txt,sha256=iti6iZS2OEeBqO5aHlWeMFcbuwN_2assidP0qeSkQ6E,346
+rda_python_dbms-2.0.7.dist-info/top_level.txt,sha256=4T1ShNUMyiqmwDIuDL7pDOm_S-6zWWW3Vy6OdAzYA4c,16
+rda_python_dbms-2.0.7.dist-info/RECORD,,

{rda_python_dbms-2.0.6.dist-info → rda_python_dbms-2.0.7.dist-info}/WHEEL

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