rda-python-metrics 1.0.12__tar.gz → 1.0.15__tar.gz

{rda_python_metrics-1.0.12/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.15}/PKG-INFO

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

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

{rda_python_metrics-1.0.12 → rda_python_metrics-1.0.15}/src/rda_python_metrics/fillcdgusage.py

@@ -191,9 +191,9 @@ def get_dsid_records(cdgids, dates, strids):
       dscnd += "= '{}'".format(cdgids[0])
    else:
       dscnd += "IN ('" + "','".join(cdgids) + "')"
-   dtcnd = "date_completed BETWEEN '{}' AND '{}'".format(dates[0], dates[1])
-   cond = "{} AND completed = True AND {} ORDER BY date_completed".format(dscnd, dtcnd)
-   PgLOG.pglog("{}: Query for {} CDG dsid/subdsids and {} at {}".format(strids, dscnt, dtcnd, PgLOG.current_datetime()), PgLOG.LOGWRN)
+   dtcnd = "date_completed BETWEEN '{} 00:00:00' AND '{} 23:59:59'".format(dates[0], dates[1])
+   cond = "{} AND {} ORDER BY date_completed".format(dscnd, dtcnd)
+   PgLOG.pglog("{}: Query for {} CDG dsid/subdsids between {} and {} at {}".format(strids, dscnt, dates[0], dates[1], PgLOG.current_datetime()), PgLOG.LOGWRN)
    pgrecs = PgDBI.pgmget(tbname, fields, cond)
    PgDBI.dssdb_dbname()
 
@@ -241,7 +241,7 @@ def fill_cdg_usages(dsids, dranges):
             wfrec = get_wfile_record(rdaids, wfile)
             if not wfrec: continue
             dsid = wfrec['dsid']
-            ms = re.search(r'^https://tds.ucar.edu/thredds/(\w+)/', url)
+            ms = re.search(r'^https*://tds.ucar.edu/thredds/(\w+)/', url)
             if ms:
                # tds usage
                method = ms.group(1)
@@ -272,7 +272,7 @@ def fill_cdg_usages(dsids, dranges):
                # web usage
                fsize = pgrec['dataset_file_size']
                if not fsize: fsize = pgrec['logic_file_size']
-               method = 'CDP'
+               method = 'CDG'
                if pgrec['subset_file_size'] or pgrec['range_request'] or dsize < fsize:
                   wkey = "{}:{}:{}".format(ip, dsid, wfile)
                else:
@@ -301,16 +301,16 @@ def fill_cdg_usages(dsids, dranges):
 
 def get_record_date_time(ctime):
 
-   ms = re.search(r'^(\d+)/(\w+)/(\d+) (\d+:\d+:\d+)(\.|$)', str(ctime))
+   ms = re.search(r'^(\d+)-(\d+)-(\d+) (\d\d:\d\d:\d\d)', str(ctime))
    if ms:
-      d = int(ms.group(1))
-      m = PgUtil.get_month(ms.group(2))
+      y = ms.group(1)
+      m = int(ms.group(2))
+      d = ms.group(3)
       q = 1 + int((m-1)/3)
-      y = ms.group(3)
       t = ms.group(4)
-      return (y, q, "{}-{:02}-{:02}".format(y, m, d), t)
+      return (y, q, "{}-{:02}-{}".format(y, m, d), t)
    else:
-      PgLOG.pglog("time: Invalid date format", PgLOG.LGEREX)
+      PgLOG.pglog(str(ctime) + ": Invalid time format", PgLOG.LGEREX)
 
 def add_tdsusage_records(year, records, date):
 
@@ -329,7 +329,7 @@ def add_tdsusage_records(year, records, date):
 
 def add_tds_allusage(year, logrec):
 
-   pgrec = {'method' : 'CDP', 'source' : 'C'}
+   pgrec = {'method' : 'CDG', 'source' : 'C'}
    pgrec['email'] = logrec['email']
    pgrec['org_type'] = logrec['org_type']
    pgrec['country'] = logrec['country']

{rda_python_metrics-1.0.12 → rda_python_metrics-1.0.15/src/rda_python_metrics.egg-info}/PKG-INFO

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