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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of rda-python-metrics might be problematic. Click here for more details.

Files changed (7) hide show
  1. rda_python_metrics/fillcdgusage.py +4 -4
  2. {rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.16.dist-info}/METADATA +1 -1
  3. {rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.16.dist-info}/RECORD +7 -7
  4. {rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.16.dist-info}/WHEEL +0 -0
  5. {rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.16.dist-info}/entry_points.txt +0 -0
  6. {rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.16.dist-info}/licenses/LICENSE +0 -0
  7. {rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.16.dist-info}/top_level.txt +0 -0
rda_python_metrics/fillcdgusage.py CHANGED
@@ -263,10 +263,10 @@ def fill_cdg_usages(dsids, dranges):
263
263
  trecs[tkey]['fcount'] += 1
264
264
  else:
265
265
  wurec = get_wuser_record(ip)
266
- if not wurec: return 0
267
- trecs[tkey] = {'ip' : ip, 'dsid' : dsid, 'date' : cdate, 'time' : time, 'size' : dsize,
268
- 'fcount' : 1, 'method' : method, 'etype' : etype, 'engine' : engine,
269
- 'org_type' : wurec['org_type'], 'country' : wurec['country'],
266
+ if not wurec: continue
267
+ trecs[tkey] = {'ip' : ip, 'dsid' : dsid, 'date' : cdate, 'time' : time, 'quarter' : quarter,
268
+ 'size' : dsize, 'fcount' : 1, 'method' : method, 'etype' : etype,
269
+ 'engine' : engine, 'org_type' : wurec['org_type'], 'country' : wurec['country'],
270
270
  'email' : wurec['email']}
271
271
  else:
272
272
  # web usage
{rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.16.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.15
3
+ Version: 1.0.16
4
4
  Summary: RDA Python Package to gather and view data usage metrics
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics
{rda_python_metrics-1.0.15.dist-info → rda_python_metrics-1.0.16.dist-info}/RECORD RENAMED
@@ -3,7 +3,7 @@ rda_python_metrics/PgView.py,sha256=r6otb3DjfiaQJdg0z8bZQAOlhr4JnrXJzp9wgWh_8qQ,
3
3
  rda_python_metrics/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
4
4
  rda_python_metrics/fillawsusage.py,sha256=dpI3-EFINJECdCSUOm37A97CJNIxOS2nYwA0fB0IpHE,9055
5
5
  rda_python_metrics/fillawsusage.usg,sha256=pD_nYTfg1so9nvVEyPSWdgKvb9gWdtfHJAs3RsT2MMU,609
6
- rda_python_metrics/fillcdgusage.py,sha256=chIkU5pCP6zSdoQNLYGEfXZFvEXL1pBRXwj7hMjGv4A,15743
6
+ rda_python_metrics/fillcdgusage.py,sha256=qywG_w01-DGCnRBV8fQ3ceziGMaO6s0mVU0_ebo_q-4,15764
7
7
  rda_python_metrics/fillcdgusage.usg,sha256=5lkd4Zdi72nQcha-JtbaLnxl66V4wBDykKwQtUOtMrw,667
8
8
  rda_python_metrics/fillcodusage.py,sha256=Hp3VrlIqHBWRI6Zjbi0nxWZPNvPrKsGBSZ1L9qA9_y0,8006
9
9
  rda_python_metrics/fillcodusage.usg,sha256=3B5IkQ4uwylqY8uEfUdnZ_MXqhYudeylMp5ulhUGXH8,678
@@ -44,9 +44,9 @@ rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmj
44
44
  rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
45
45
  rda_python_metrics/viewwebusage.py,sha256=jhoHuRPVNtp7Lbjv0l-Jy_vp2p2nWQC7IVZ0P4JUJ4I,16657
46
46
  rda_python_metrics/viewwebusage.usg,sha256=IsT72v22xyZf7ng_IodVs0dLTsH1Q4BtFvT-gs0-xJY,9946
47
- rda_python_metrics-1.0.15.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
48
- rda_python_metrics-1.0.15.dist-info/METADATA,sha256=ZjQTk2Zb7zim6WxxlSAKl30hT69EL3rG9oZjJGBsH1o,736
49
- rda_python_metrics-1.0.15.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
50
- rda_python_metrics-1.0.15.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
51
- rda_python_metrics-1.0.15.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
52
- rda_python_metrics-1.0.15.dist-info/RECORD,,
47
+ rda_python_metrics-1.0.16.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
48
+ rda_python_metrics-1.0.16.dist-info/METADATA,sha256=u_9Qr2dLsq5ub0XFoN8PQ4UPS1kKMP5l4r_mEgcSxUg,736
49
+ rda_python_metrics-1.0.16.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
50
+ rda_python_metrics-1.0.16.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
51
+ rda_python_metrics-1.0.16.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
52
+ rda_python_metrics-1.0.16.dist-info/RECORD,,