rda-python-metrics 1.0.16__tar.gz → 1.0.17__tar.gz

{rda_python_metrics-1.0.16/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.16
+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.16 → rda_python_metrics-1.0.17}/pyproject.toml

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

{rda_python_metrics-1.0.16 → rda_python_metrics-1.0.17}/src/rda_python_metrics/fillcdgusage.py

@@ -262,7 +262,7 @@ def fill_cdg_usages(dsids, dranges):
                   trecs[tkey]['size'] += dsize
                   trecs[tkey]['fcount'] += 1
                else:
-                  wurec =  get_wuser_record(ip)
+                  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,
@@ -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.16 → rda_python_metrics-1.0.17/src/rda_python_metrics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.16
+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