rda-python-metrics 1.0.15__py3-none-any.whl → 1.0.17__py3-none-any.whl

rda_python_metrics/fillcdgusage.py

@@ -262,11 +262,11 @@ def fill_cdg_usages(dsids, dranges):
                   trecs[tkey]['size'] += dsize
                   trecs[tkey]['fcount'] += 1
                else:
-                  wurec =  get_wuser_record(ip)
-                  if not wurec: return 0
-                  trecs[tkey] = {'ip' : ip, 'dsid' : dsid, 'date' : cdate, 'time' : time, 'size' : dsize,
-                                 'fcount' : 1, 'method' : method, 'etype' : etype, 'engine' : engine,
-                                 'org_type' : wurec['org_type'], 'country' : wurec['country'],
+                  wurec =  get_wuser_record(ip, cdate)
+                  if not wurec: continue
+                  trecs[tkey] = {'ip' : ip, 'dsid' : dsid, 'date' : cdate, 'time' : time, 'quarter' : quarter,
+                                 'size' : dsize, 'fcount' : 1, 'method' : method, 'etype' : etype,
+                                 'engine' : engine, 'org_type' : wurec['org_type'], 'country' : wurec['country'],
                                  'email' : wurec['email']}
             else:
                # web usage
@@ -353,7 +353,7 @@ def add_webfile_usage(year, logrec):
    cond = "wid = {} AND method = '{}' AND date_read = '{}' AND time_read = '{}'".format(logrec['wid'], logrec['method'], cdate, logrec['time'])
    if PgDBI.pgget(table, "", cond, PgLOG.LOGWRN): return 0
 
-   wurec =  get_wuser_record(ip, cdate, False)
+   wurec =  get_wuser_record(ip, cdate)
    if not wurec: return 0
 
    record = {'wid' : logrec['wid'], 'dsid' : logrec['dsid']}
@@ -418,7 +418,7 @@ def get_wfile_record(dsids, wfile):
    return pgrec
 
 # return wuser record upon success, None otherwise
-def get_wuser_record(ip, date = None, skipwuid = True):
+def get_wuser_record(ip, date = None):
 
    if ip in WUSERS: return WUSERS[ip]
 
@@ -427,16 +427,11 @@ def get_wuser_record(ip, date = None, skipwuid = True):
 
    record = {'org_type' : ipinfo['org_type'], 'country' : ipinfo['country']}
    email = 'unknown@' + ipinfo['hostname']
-   if skipwuid:
-      record['email'] = email
-      WUSERS[ip] = record
-      return record
-
    emcond = "email = '{}'".format(email)
    flds = 'wuid, email, org_type, country, start_date'   
    pgrec = PgDBI.pgget("wuser", flds, emcond, PgLOG.LOGERR)
    if pgrec:
-      if PgUtil.diffdate(pgrec['start_date'], date) > 0:
+      if date and PgUtil.diffdate(pgrec['start_date'], date) > 0:
          pgrec['start_date'] = record['start_date'] = date
          PgDBI.pgupdt('wuser', record, emcond)
       WUSERS[ip] = pgrec

{rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.15
+Version: 1.0.17
 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.15.dist-info → rda_python_metrics-1.0.17.dist-info}/RECORD

@@ -3,7 +3,7 @@ rda_python_metrics/PgView.py,sha256=r6otb3DjfiaQJdg0z8bZQAOlhr4JnrXJzp9wgWh_8qQ,
 rda_python_metrics/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 rda_python_metrics/fillawsusage.py,sha256=dpI3-EFINJECdCSUOm37A97CJNIxOS2nYwA0fB0IpHE,9055
 rda_python_metrics/fillawsusage.usg,sha256=pD_nYTfg1so9nvVEyPSWdgKvb9gWdtfHJAs3RsT2MMU,609
-rda_python_metrics/fillcdgusage.py,sha256=chIkU5pCP6zSdoQNLYGEfXZFvEXL1pBRXwj7hMjGv4A,15743
+rda_python_metrics/fillcdgusage.py,sha256=u8sclbsNJaZJ_hJxvZAhaGGppCPBh6WiBLnJM8GoMi8,15663
 rda_python_metrics/fillcdgusage.usg,sha256=5lkd4Zdi72nQcha-JtbaLnxl66V4wBDykKwQtUOtMrw,667
 rda_python_metrics/fillcodusage.py,sha256=Hp3VrlIqHBWRI6Zjbi0nxWZPNvPrKsGBSZ1L9qA9_y0,8006
 rda_python_metrics/fillcodusage.usg,sha256=3B5IkQ4uwylqY8uEfUdnZ_MXqhYudeylMp5ulhUGXH8,678
@@ -44,9 +44,9 @@ rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmj
 rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
 rda_python_metrics/viewwebusage.py,sha256=jhoHuRPVNtp7Lbjv0l-Jy_vp2p2nWQC7IVZ0P4JUJ4I,16657
 rda_python_metrics/viewwebusage.usg,sha256=IsT72v22xyZf7ng_IodVs0dLTsH1Q4BtFvT-gs0-xJY,9946
-rda_python_metrics-1.0.15.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.15.dist-info/METADATA,sha256=ZjQTk2Zb7zim6WxxlSAKl30hT69EL3rG9oZjJGBsH1o,736
-rda_python_metrics-1.0.15.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-rda_python_metrics-1.0.15.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
-rda_python_metrics-1.0.15.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.15.dist-info/RECORD,,
+rda_python_metrics-1.0.17.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.17.dist-info/METADATA,sha256=uzy8JKTADowLHXZz5NwU6bVBt9i3rAkvfBpwEbTt8sA,736
+rda_python_metrics-1.0.17.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+rda_python_metrics-1.0.17.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
+rda_python_metrics-1.0.17.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.17.dist-info/RECORD,,

{rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.17.dist-info}/WHEEL

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