rda-python-dbms 2.0.5__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/tables/cntldb/ivadref.json

@@ -0,0 +1,59 @@
+{
+  "header": {
+    "author": "Zaihua Ji, zji@ucar.edu",
+    "date": "04/10/2014",
+    "description": "icoads ivad reference table information"
+  },
+  "database": "rdadb",
+  "schema": "cntldb",
+  "name": "ivadref",
+  "pkey": "ridx",
+  "column": [
+    {
+      "name": "ridx",
+      "type": "bigserial",
+      "pkey": "PRIMARY KEY",
+      "comment": "reference index"
+    },
+    {
+      "name": "tidx",
+      "type": "smallint",
+      "notnull": "NOT NULL",
+      "comment": "icoads table index id"
+    },
+    {
+      "name": "fname",
+      "type": "char(5)",
+      "notnull": "NOT NULL",
+      "comment": "original field name"
+    },
+    {
+      "name": "arci",
+      "type": "char(4)",
+      "notnull": "NOT NULL",
+      "comment": "author reference code"
+    },
+    {
+      "name": "cdi",
+      "type": "int",
+      "notnull": "NOT NULL",
+      "comment": "creation date"
+    }
+  ],
+  "index": [
+    {
+      "name": "ivadref_idx_1",
+      "column": "arci, cdi, fname, tidx",
+      "unique": "UNIQUE"
+    },
+    {
+      "name": "ivadref_idx_2",
+      "column": "fname"
+    },
+    {
+      "name": "ivadref_idx_3",
+      "column": "tidx"
+    }
+  ],
+  "comment": "ICOADS IMMA TABLE SUMMARY"
+}

rda_python_dbms/tables/dssdb/allusage.json

@@ -18,7 +18,7 @@
     },
     {
       "name": "email",
-      "type": "varchar(80)",
+      "type": "varchar(128)",
       "comment": "user email address"
     },
     {

rda_python_dbms/tables/dssdb/awsusage.json

@@ -10,7 +10,7 @@
   "column": [
     {
       "name": "email",
-      "type": "varchar(80)",
+      "type": "varchar(128)",
       "comment": "user email address"
     },
     {

rda_python_dbms/tables/dssdb/codusage.json

@@ -38,7 +38,7 @@
     },
     {
       "name": "email",
-      "type": "varchar(80)",
+      "type": "varchar(128)",
       "comment": "user email address"
     },
     {

rda_python_dbms/tables/dssdb/dataset.json

@@ -141,6 +141,12 @@
       "default": "'N'",
       "comment": "automtic backup flag: B-Backup or D-Backup&Drdata"
     },
+    {
+      "name": "taccflag",
+      "type": "char(1)",
+      "default": "'N'",
+      "comment": "tacc backup flag: B-Backup"
+    },
     {
       "name": "accessflag",
       "type": "char(1)",

{rda_python_dbms-2.0.5.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.5
+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.5.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
@@ -26,6 +26,7 @@ rda_python_dbms/tables/cntldb/iattm.json,sha256=Hn7wRW0AZ4Pr7nc4YICKDby9MfVmLuKS
 rda_python_dbms/tables/cntldb/iattm_daily.json,sha256=h3b-1K6DvuXYfW-chxJCP4rbPxwTvWoYRF7c5YTp9KY,1191
 rda_python_dbms/tables/cntldb/inventory.json,sha256=ImQJgj-iVN87ARnvZYqxNR9QWBO0NGnsC5Z_kEz58tA,1624
 rda_python_dbms/tables/cntldb/itidx.json,sha256=xa3yt_SeqhcN_ptyt0yeAr-_yQSjVY8Rsine7oQRz_o,1129
+rda_python_dbms/tables/cntldb/ivadref.json,sha256=0LH6heVVChpAPk9Gbn9KpMk7KldqF2evXSqk6M_NXG0,1189
 rda_python_dbms/tables/cntldb0/iattm.json,sha256=Hn7wRW0AZ4Pr7nc4YICKDby9MfVmLuKSCKMdYIthVqg,967
 rda_python_dbms/tables/cntldb0/iattm_daily.json,sha256=h3b-1K6DvuXYfW-chxJCP4rbPxwTvWoYRF7c5YTp9KY,1191
 rda_python_dbms/tables/cntldb0/iinventory.json,sha256=GALvz1LTFPgLSUcgYdxsOrugcNbw4QEZfQnrpA2EwoY,928
@@ -35,8 +36,8 @@ rda_python_dbms/tables/cntldb0/ivadref.json,sha256=0LH6heVVChpAPk9Gbn9KpMk7KldqF
 rda_python_dbms/tables/dssdb/acard.json,sha256=Ls_cqEntul8ciWEzr07N0z_Qu-eiumPldKPeXWhFpHU,951
 rda_python_dbms/tables/dssdb/access_types.json,sha256=i3UcF_leD2sg9Yz8sZDEgqIqK7P3I25uhzZgL_2kqWo,655
 rda_python_dbms/tables/dssdb/access_types_dev.json,sha256=WfT6sCynXAg3TiKEUtfHK6ME2I0LbKO07p9Snbgb4F0,823
-rda_python_dbms/tables/dssdb/allusage.json,sha256=95v-ZJyURwEqNBerpllroD-vIow_Ns9juabGl90Uaw4,2407
-rda_python_dbms/tables/dssdb/awsusage.json,sha256=2Ja5BZU107zEVWdcmRXFHK6bFHPOar9qWmtI5ADnjuY,2208
+rda_python_dbms/tables/dssdb/allusage.json,sha256=tXI9iomkHLX8fZdlS0l_WmyVY0ZDE1CHD3A7jnISibQ,2408
+rda_python_dbms/tables/dssdb/awsusage.json,sha256=QJCvsUhhiEDJtGf_JN2AcJ_R-ltDLCtHvi3M0xQoG3Y,2209
 rda_python_dbms/tables/dssdb/bfile.json,sha256=zs78X055a0kTcZSpj-MGptB96F2LFbOZwgA2S6sbun0,2920
 rda_python_dbms/tables/dssdb/bldusage.json,sha256=3bviCAckkI-dMfYBFs96N_uCOnCVpWkJbFEj59M5NZI,2137
 rda_python_dbms/tables/dssdb/cardhist.json,sha256=A_1LwSjiyv5sHqKMF6P_5jgRW3kRrQQNIRGVU62pTSg,1194
@@ -44,11 +45,11 @@ rda_python_dbms/tables/dssdb/checklimit.json,sha256=44kQIxVb0WtWTecrm90enzvympEm
 rda_python_dbms/tables/dssdb/ci_cd.json,sha256=RM3qgXa5jl2dVlk6ZOSZv0C1SXf7mT8JSs2fv-YLQGc,526
 rda_python_dbms/tables/dssdb/clranges.json,sha256=KnlsEGxg5Yjv7-m3oYkkMxNmNWdKOzGwmwksX6ui_5E,567
 rda_python_dbms/tables/dssdb/cmd_reg.json,sha256=qKFg2BlDU-6DO7kORnvLm2W7Oq-FlQ62XUMnQsV5liE,868
-rda_python_dbms/tables/dssdb/codusage.json,sha256=zlmUhmxVESegBxstIW_xoVW7p7NBWYcPZX64RB3Z064,2286
+rda_python_dbms/tables/dssdb/codusage.json,sha256=M39yic_8K0N7h3pXKrZDYjwEIjdcQ0Kg412QvoIPIaY,2287
 rda_python_dbms/tables/dssdb/countries.json,sha256=nj7BLf39-hdt4P5QE5fW38ro5AOZhI8SCBGcWDt9_mg,832
 rda_python_dbms/tables/dssdb/country_info.json,sha256=b7QbMS6bYgpkzpRe8wqzZfFn8YNWeaGSJUZcvx0MRP8,1477
 rda_python_dbms/tables/dssdb/daphist.json,sha256=UrGIHs9rxbeWvNIS2n77ry6jMv4LYMe7uIK2pocjVZY,404
-rda_python_dbms/tables/dssdb/dataset.json,sha256=t9gQbazF2pwHuF4-25qri9HY4Ugw2HLouJo34jF4Hbc,6940
+rda_python_dbms/tables/dssdb/dataset.json,sha256=27MOIQxyv5FgQWFHLXlBcoF_3LNfAPKgrkqN81Nky7Q,7074
 rda_python_dbms/tables/dssdb/datastat.json,sha256=YN9anPt8YZrFI0he_oTB2z2UfLtmvqqL92lzt7v-6RM,1506
 rda_python_dbms/tables/dssdb/dcard.json,sha256=FRPmy3vN2ZgEcurqIVO_hSsEsGh1yKGx8PWjPHYHyfE,953
 rda_python_dbms/tables/dssdb/dcrqst.json,sha256=AJrROpsdJIcOdbrI0rL4pi8dz06egJD6vzJnMsszWNM,2664
@@ -953,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.5.dist-info/licenses/LICENSE,sha256=Uky6fiiVw7cakFVRtVpzg-mvqOQ-WcA_H8lHqhPRg58,1101
-rda_python_dbms-2.0.5.dist-info/METADATA,sha256=tFbxvl9rgxND97_Zu68qgAF0TYGUlcKbpJeuDl6VYAs,617
-rda_python_dbms-2.0.5.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-rda_python_dbms-2.0.5.dist-info/entry_points.txt,sha256=iti6iZS2OEeBqO5aHlWeMFcbuwN_2assidP0qeSkQ6E,346
-rda_python_dbms-2.0.5.dist-info/top_level.txt,sha256=4T1ShNUMyiqmwDIuDL7pDOm_S-6zWWW3Vy6OdAzYA4c,16
-rda_python_dbms-2.0.5.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.5.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