rda-python-metrics 1.0.36__py3-none-any.whl → 1.0.38__py3-none-any.whl

rda_python_metrics/logarch.py

@@ -330,12 +330,12 @@ def add_sublog_files(fext, sext, minsize = 0):
       sfile = "{}/{}".format(subname, afile)
       if minsize and PgFile.local_file_size(sfile, 1) < 1: continue
       PgLOG.pgsystem("echo '{}: {}' >> {}".format(bid, sfiles[afile], logfile), PgLOG.LGWNEX, 5+1024)
-      PgLOG.pgsystem("cat {} >> {}".format(sfile, logfile), PgLOG.LGWNEX, 5+1024)
-      PgFile.delete_local_file(sfile, PgLOG.LOGWRN)
-      acnt += 1
+      if PgLOG.pgsystem("cat {} >> {}".format(sfile, logfile), PgLOG.EMEROL, 5+1024):
+         PgFile.delete_local_file(sfile, PgLOG.LOGWRN)
+         acnt += 1
    if fcnt > 0:
       s = 's' if fcnt > 1 else ''
-      PgLOG.pglog("{}: {} of {} '{}' file{} appended at {}".format(logfile, acnt, fcnt, fext, s, PgLOG.current_datetime()), PgLOG.LOGWRN)
+      PgLOG.pglog("{}: {} of {} '{}' file{} appended at {}".format(logfile, acnt, fcnt, fext, s, PgLOG.current_datetime()), PgLOG.LGWNEM)
 
    if minsize: PgLOG.PGLOG['MINSIZE'] = tmin
 

rda_python_metrics/viewosdfusage.usg

@@ -2,19 +2,19 @@
  View usage information of OSDF Data Services from information
  stored in PostgreSQL database 'RDADB'.
 
- Usage: viewawsusage [-C] ColumnNames [-O OrderColumnNames] [-a] \
-                     [-A RowLimit] [-c CountryCodes] [-d DateList] \
-                     [-D StartDate [EndDate]] [-e EMailList] -h \
-                     [-E StartNoticeDate [EndNoticeDate]] \
-                     [-i IPAddresses] [-I EmailIDList] \
-                     [-k RegionNames] [-m MonthList] [-M AccessMethods]  \
-                     [-N MinNumberRead [MaxNumberRead]] \
-                     [-o OrganizationTypes] \
-                     [-q QuaterList] [-s MinSize [MaxSize]] \
-                     [-S SpecialistLoginNames] [-t DatasetList] \
-                     [-T MinDataset [MaxDataset]] [-y YearList] \
-                     [-H Title] [-L Delimiter] [-U SizeUnit] \
-                     [-w] [-z] [> OutputFileName] [| lp -d PrinterName] 
+ Usage: viewosdfusage [-C] ColumnNames [-O OrderColumnNames] [-a] \
+                      [-A RowLimit] [-c CountryCodes] [-d DateList] \
+                      [-D StartDate [EndDate]] [-e EMailList] -h \
+                      [-E StartNoticeDate [EndNoticeDate]] \
+                      [-i IPAddresses] [-I EmailIDList] \
+                      [-k RegionNames] [-m MonthList] [-M AccessMethods]  \
+                      [-N MinNumberRead [MaxNumberRead]] \
+                      [-o OrganizationTypes] \
+                      [-q QuaterList] [-s MinSize [MaxSize]] \
+                      [-S SpecialistLoginNames] [-t DatasetList] \
+                      [-T MinDataset [MaxDataset]] [-y YearList] \
+                      [-H Title] [-L Delimiter] [-U SizeUnit] \
+                      [-w] [-z] [> OutputFileName] [| lp -d PrinterName] 
 
       Specify [-C] ColumnNames, refer to Option -C section for detail
       description, and choose at least one of the condition options, -a, -c,
@@ -98,7 +98,7 @@
 
 
       Condition Options:
-      - Option -a, for all usage in table 'awsusage';
+      - Option -a, for all usage in table 'osdfusage';
 
       - Option -A, gives a row limit for querrying; 
 
@@ -175,16 +175,16 @@
       EMAIL(E), ORGTYPE(O), #READ(H), and MBREAD(B); ordered by ORGTYPE as
       ascending and MBREAD(B) as descending; the command line should be:
 
-         viewawsusage XEOHB -y 2005 -O Ob
+         viewosdfusage XEOHB -y 2005 -O Ob
 
       For usage by users not in Organization 'DDS', out of the file usage
       gathered above, the command line should be:
 
-         viewawsusage XEOHB -y 2005 -o ! DSS -O Ob
+         viewosdfusage XEOHB -y 2005 -o ! DSS -O Ob
 
-      To redirect the previous output to a file named awsusage.out:
+      To redirect the previous output to a file named osdfusage.out:
 
-         viewawsusage XEOHB -y 2005 ! DSS -O Ob > awsusage.out
+         viewosdfusage XEOHB -y 2005 ! DSS -O Ob > osdfusage.out
 
       Then you can view the file or print it as a report.
 

{rda_python_metrics-1.0.36.dist-info → rda_python_metrics-1.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.36
+Version: 1.0.38
 Summary: RDA Python Package to gather and view data usage metrics
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics

{rda_python_metrics-1.0.36.dist-info → rda_python_metrics-1.0.38.dist-info}/RECORD

@@ -25,7 +25,7 @@ rda_python_metrics/filltdsusage.py,sha256=vOwVzAtWUHO4O-FCSJMg0GKxw-Xc5AzSbfqVFk
 rda_python_metrics/filltdsusage.usg,sha256=yqTHRe8WpZWpu3gso_obgt6LO41-JC27rTIDfdZcISo,538
 rda_python_metrics/filluser.py,sha256=CvaMRaUPaR9nxJAExkLTb3Ci4sD7RQMOpWhWJdbyMF0,8907
 rda_python_metrics/filluser.usg,sha256=Xgqi0QwA9-4jpYj3L4Q4TISpVwRlsomt2G7T0oYAFak,520
-rda_python_metrics/logarch.py,sha256=cMty6vI5t4oBAKnA4VYZjEvfYoj_8cSUuW0orPOJOZQ,13721
+rda_python_metrics/logarch.py,sha256=cs7ArEq9wrHv2SDZMmt02sjW7W_WYc4zo0guggQZm_4,13731
 rda_python_metrics/logarch.usg,sha256=6ksFxu_-lzhRpQE2YFAqgGVhwFP4PTweCbFBuGhhICU,960
 rda_python_metrics/pgperson.py,sha256=4XTDnVBFyF9drzx2I_DGCxQ-8I1bpclqTuQvOx3wST4,2088
 rda_python_metrics/pgsyspath.py,sha256=DZhFp-r-LzN0qrHtfdCYfnGDnmD_R4ufuEduk0_vRIw,1039
@@ -41,7 +41,7 @@ rda_python_metrics/viewcodusage.usg,sha256=WH3gSml94_jbm20kqAUFUSnla4JQZrseTZe24
 rda_python_metrics/viewordusage.py,sha256=cnZMSfxWlCNbh1Ck3LfC0wQxS6HCv6TBVOnOVzRU65E,15484
 rda_python_metrics/viewordusage.usg,sha256=19tHhPZB9y247BddfwtXA3_K50BnzEJcWUbBNw-3NPU,10568
 rda_python_metrics/viewosdfusage.py,sha256=xpSi1VcjtEmfF9fAwSOeGLYYj3j972bX6kj0fZUL6Q4,14159
-rda_python_metrics/viewosdfusage.usg,sha256=J9dE98j3BUWGej6kIXz46Pl7nntsTBoJvxFcb6mqTb0,8844
+rda_python_metrics/viewosdfusage.usg,sha256=KFPwT1KeQixp0Cj_J1aS--Tb9VTJqM9wfuqmqGKQW2I,8863
 rda_python_metrics/viewrqstusage.py,sha256=wNH5DTEBYrUQKAms10weBH939r-m3tLXXg5PwS6bzlk,16690
 rda_python_metrics/viewrqstusage.usg,sha256=Ii5-7h_RO2rkoE9VLxuLhc9klgkEJSqHoDrsOlQOTKo,10481
 rda_python_metrics/viewtdsusage.py,sha256=nmtH4d7pPqSwLoAlocb5UTk0W38TT57gWmCyuKL4bF8,14505
@@ -50,9 +50,9 @@ rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmj
 rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
 rda_python_metrics/viewwebusage.py,sha256=ES2lI8NaCeCpTGi94HU-cDRBxHMiUBbplyYsZf2KqF0,16650
 rda_python_metrics/viewwebusage.usg,sha256=OVDZ78p87E3HLW34ZhasNJ7Zmw8XXjmZPPWZfRhPLXo,9936
-rda_python_metrics-1.0.36.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.36.dist-info/METADATA,sha256=JyzrAexSHYqltfa28z8N-MH9-6U0Ve2mBVFlwjX05hk,761
-rda_python_metrics-1.0.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_metrics-1.0.36.dist-info/entry_points.txt,sha256=_Cw8KvtYwxLPt3kLJHwQ1r2swsKKbXk-2zYPZAg2czc,1345
-rda_python_metrics-1.0.36.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.36.dist-info/RECORD,,
+rda_python_metrics-1.0.38.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.38.dist-info/METADATA,sha256=xOpXA8dmLOGDnjQR-2Ro9XC4W7ZKQORlyPWfMkurfqs,761
+rda_python_metrics-1.0.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_metrics-1.0.38.dist-info/entry_points.txt,sha256=_Cw8KvtYwxLPt3kLJHwQ1r2swsKKbXk-2zYPZAg2czc,1345
+rda_python_metrics-1.0.38.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.38.dist-info/RECORD,,