rda-python-metrics 1.0.25__py3-none-any.whl → 1.0.26__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 (8) hide show
  1. rda_python_metrics/PgIPInfo.py +2 -2
  2. rda_python_metrics/fillipinfo.py +1 -1
  3. {rda_python_metrics-1.0.25.dist-info → rda_python_metrics-1.0.26.dist-info}/METADATA +1 -1
  4. {rda_python_metrics-1.0.25.dist-info → rda_python_metrics-1.0.26.dist-info}/RECORD +8 -8
  5. {rda_python_metrics-1.0.25.dist-info → rda_python_metrics-1.0.26.dist-info}/WHEEL +0 -0
  6. {rda_python_metrics-1.0.25.dist-info → rda_python_metrics-1.0.26.dist-info}/entry_points.txt +0 -0
  7. {rda_python_metrics-1.0.25.dist-info → rda_python_metrics-1.0.26.dist-info}/licenses/LICENSE +0 -0
  8. {rda_python_metrics-1.0.25.dist-info → rda_python_metrics-1.0.26.dist-info}/top_level.txt +0 -0
rda_python_metrics/PgIPInfo.py CHANGED
@@ -115,8 +115,8 @@ def get_ip_hostname(ip, iprec, record):
115
115
  record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
116
116
  return
117
117
  record['hostname'] = ip
118
- if 'domain' in iprec and iprec['domain']:
119
- record['hostname'] += '.' + iprec['domain']
118
+ if 'asn' in iprec and 'domain' in iprec['asn'] and iprec['asn']['domain']:
119
+ record['hostname'] += '.' + iprec['asn']['domain']
120
120
  record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
121
121
  return
122
122
 
rda_python_metrics/fillipinfo.py CHANGED
@@ -113,7 +113,7 @@ def fill_ip_info(option, inputs, table):
113
113
  def get_next_date(date, edate):
114
114
 
115
115
  if date < edate:
116
- ndate = PgUtil.enddate(date, 'M')
116
+ ndate = PgUtil.enddate(date, 0, 'M')
117
117
  if ndate < edate: edate = ndate
118
118
  if date < edate:
119
119
  cond = f"BETWEEN '{date}' AND '{edate}'"
{rda_python_metrics-1.0.25.dist-info → rda_python_metrics-1.0.26.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.25
3
+ Version: 1.0.26
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.25.dist-info → rda_python_metrics-1.0.26.dist-info}/RECORD RENAMED
@@ -1,4 +1,4 @@
1
- rda_python_metrics/PgIPInfo.py,sha256=KMU3_SuuGJgJby3xmmGZ2VGudCgsmI9j4ttZYaTMJeQ,9021
1
+ rda_python_metrics/PgIPInfo.py,sha256=bSsVvPhqglP21DETqBuyCT3g5P5_c_8t4PzVPCEtna4,9061
2
2
  rda_python_metrics/PgView.py,sha256=r6otb3DjfiaQJdg0z8bZQAOlhr4JnrXJzp9wgWh_8qQ,24369
3
3
  rda_python_metrics/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
4
4
  rda_python_metrics/fillawsusage.py,sha256=SZH9G4jruKvavqSr9DiVmHVW929E60tJGUkv8CK3GQI,8152
@@ -11,7 +11,7 @@ rda_python_metrics/fillcountry.py,sha256=7i5LNi3scRoyRCT6t7aeNTGKOpxzJ2mA9tnvUqj
11
11
  rda_python_metrics/fillendtime.py,sha256=skZttlpoY19g0dGwqGQI8t_1YPPTPEXwg3EfNlfL90I,2533
12
12
  rda_python_metrics/fillglobususage.py,sha256=ahz8XnnJdD_AbSYqJ34lWmDuzws_-SNmCR8QE20aovA,8539
13
13
  rda_python_metrics/fillglobususage.usg,sha256=1GgmCP22IQZdADwL5Mmkz3v8Ws-G7U3teQ1AxRJfV_4,637
14
- rda_python_metrics/fillipinfo.py,sha256=AKxdFb3Kfra54Vb9zBt6HwqOGpX4dhF5CIH4q_yFPE0,6771
14
+ rda_python_metrics/fillipinfo.py,sha256=XUX1QGlIYICDZ0b3pcTjuMKwCq7vaTLFGwNxF2PIg1c,6774
15
15
  rda_python_metrics/fillipinfo.usg,sha256=YeCR58xGv0emqHUZ_9R977HrqaeBwbd6j5QRF2Lc7TA,702
16
16
  rda_python_metrics/filloneorder.py,sha256=ADHbcKCDh9bJunnxYbkbjwU2QpC43hvGlLWaURHNxkg,5433
17
17
  rda_python_metrics/filloneorder.usg,sha256=mtOySKx6-D4k2bbTcmi6cSYtINiycRyHQkHozi0CQu0,1466
@@ -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=ES2lI8NaCeCpTGi94HU-cDRBxHMiUBbplyYsZf2KqF0,16650
46
46
  rda_python_metrics/viewwebusage.usg,sha256=OVDZ78p87E3HLW34ZhasNJ7Zmw8XXjmZPPWZfRhPLXo,9936
47
- rda_python_metrics-1.0.25.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
48
- rda_python_metrics-1.0.25.dist-info/METADATA,sha256=A0OujABjyHGsOSxkjJ6ekGmXyl-DhOGc9zKKDuJxL_w,761
49
- rda_python_metrics-1.0.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
50
- rda_python_metrics-1.0.25.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
51
- rda_python_metrics-1.0.25.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
52
- rda_python_metrics-1.0.25.dist-info/RECORD,,
47
+ rda_python_metrics-1.0.26.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
48
+ rda_python_metrics-1.0.26.dist-info/METADATA,sha256=GWWOgCmtd0EGUJxGWstJdGpkSFRgSV-epfYD8npoG3o,761
49
+ rda_python_metrics-1.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
50
+ rda_python_metrics-1.0.26.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
51
+ rda_python_metrics-1.0.26.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
52
+ rda_python_metrics-1.0.26.dist-info/RECORD,,