rda-python-metrics 1.0.50__tar.gz → 1.0.51__tar.gz

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.
Files changed (66) hide show
  1. {rda_python_metrics-1.0.50/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.51}/PKG-INFO +1 -1
  2. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/pyproject.toml +1 -1
  3. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/filltdsusage.py +4 -1
  4. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51/src/rda_python_metrics.egg-info}/PKG-INFO +1 -1
  5. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/LICENSE +0 -0
  6. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/MANIFEST.in +0 -0
  7. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/README.md +0 -0
  8. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/setup.cfg +0 -0
  9. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/PgIPInfo.py +0 -0
  10. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/PgView.py +0 -0
  11. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/__init__.py +0 -0
  12. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillawsusage.py +0 -0
  13. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillawsusage.usg +0 -0
  14. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillcdgusage.py +0 -0
  15. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillcdgusage.usg +0 -0
  16. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillcodusage.py +0 -0
  17. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillcodusage.usg +0 -0
  18. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillcountry.py +0 -0
  19. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillendtime.py +0 -0
  20. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillgdexusage.py +0 -0
  21. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillgdexusage.usg +0 -0
  22. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillglobususage.py +0 -0
  23. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillglobususage.usg +0 -0
  24. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillipinfo.py +0 -0
  25. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillipinfo.usg +0 -0
  26. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/filloneorder.py +0 -0
  27. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/filloneorder.usg +0 -0
  28. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillosdfusage.py +0 -0
  29. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillosdfusage.usg +0 -0
  30. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillrdadb.py +0 -0
  31. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillrdadb.usg +0 -0
  32. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/filltdsusage.usg +0 -0
  33. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/filluser.py +0 -0
  34. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/filluser.usg +0 -0
  35. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/fillzenodousage.py +0 -0
  36. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/logarch.py +0 -0
  37. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/logarch.usg +0 -0
  38. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/pgperson.py +0 -0
  39. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/pgsyspath.py +0 -0
  40. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/pgusername.py +0 -0
  41. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewallusage.py +0 -0
  42. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewallusage.usg +0 -0
  43. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewawsusage.py +0 -0
  44. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewawsusage.usg +0 -0
  45. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewcheckusage.py +0 -0
  46. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewcheckusage.usg +0 -0
  47. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewcodusage.py +0 -0
  48. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewcodusage.usg +0 -0
  49. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewordusage.py +0 -0
  50. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewordusage.usg +0 -0
  51. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewosdfusage.py +0 -0
  52. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewosdfusage.usg +0 -0
  53. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewrqstusage.py +0 -0
  54. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewrqstusage.usg +0 -0
  55. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewtdsusage.py +0 -0
  56. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewtdsusage.usg +0 -0
  57. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewwebfile.py +0 -0
  58. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewwebfile.usg +0 -0
  59. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewwebusage.py +0 -0
  60. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/viewwebusage.usg +0 -0
  61. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics.egg-info/SOURCES.txt +0 -0
  62. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics.egg-info/dependency_links.txt +0 -0
  63. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics.egg-info/entry_points.txt +0 -0
  64. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics.egg-info/requires.txt +0 -0
  65. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics.egg-info/top_level.txt +0 -0
  66. {rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/tests/test_metrics.py +0 -0
{rda_python_metrics-1.0.50/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.51}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.50
3
+ Version: 1.0.51
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.50 → rda_python_metrics-1.0.51}/pyproject.toml RENAMED
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
6
6
 
7
7
  [project]
8
8
  name = "rda_python_metrics"
9
- version = "1.0.50"
9
+ version = "1.0.51"
10
10
  authors = [
11
11
  { name="Zaihua Ji", email="zji@ucar.edu" },
12
12
  ]
{rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51}/src/rda_python_metrics/filltdsusage.py RENAMED
@@ -157,6 +157,7 @@ def fill_tds_usages(fnames):
157
157
  ip = ms.group(1)
158
158
  email = ms.group(2)
159
159
  (date, time) = get_record_date_time(ms.group(3))
160
+ if not date: continue
160
161
  method = ms.group(4)
161
162
  etype = ms.group(6)[0].upper()
162
163
  dsid = PgUtil.format_dataset_id(ms.group(7))
@@ -178,6 +179,7 @@ def fill_tds_usages(fnames):
178
179
  tds.close()
179
180
  if records: cntadd += add_usage_records(records, date)
180
181
  cntall += entcnt
182
+ addall += cntadd
181
183
 
182
184
  PgLOG.pglog("{} TDS usage records added for {} entries at {}".format(addall, cntall, PgLOG.current_datetime()), PgLOG.LOGWRN)
183
185
 
@@ -192,7 +194,8 @@ def get_record_date_time(ctime):
192
194
  t = ms.group(4)
193
195
  return ("{}-{:02}-{:02}".format(y, m, d), t)
194
196
  else:
195
- PgLOG.pglog("time: Invalid date format", PgLOG.LGEREX)
197
+ PgLOG.pglog(f"{ctime}: Invalid time format", PgLOG.LGEREX)
198
+ return (None, None)
196
199
 
197
200
  def add_usage_records(records, date):
198
201
 
{rda_python_metrics-1.0.50 → rda_python_metrics-1.0.51/src/rda_python_metrics.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_metrics
3
- Version: 1.0.50
3
+ Version: 1.0.51
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