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

rda_python_metrics/fillcdgusage.py

@@ -192,8 +192,8 @@ def get_dsid_records(cdgids, dates, strids):
    else:
       dscnd += "IN ('" + "','".join(cdgids) + "')"
    dtcnd = "date_completed BETWEEN '{} 00:00:00' AND '{} 23:59:59'".format(dates[0], dates[1])
-   cond = "{} AND completed = True AND {} ORDER BY date_completed".format(dscnd, dtcnd)
-   PgLOG.pglog("{}: Query for {} CDG dsid/subdsids Completed between {} and {} at {}".format(strids, dscnt, dates[0], dates[1], PgLOG.current_datetime()), PgLOG.LOGWRN)
+   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)
@@ -263,16 +263,16 @@ def fill_cdg_usages(dsids, dranges):
                   trecs[tkey]['fcount'] += 1
                else:
                   wurec =  get_wuser_record(ip)
-                  if not wurec: return 0
-                  trecs[tkey] = {'ip' : ip, 'dsid' : dsid, 'date' : cdate, 'time' : time, 'size' : dsize,
-                                 'fcount' : 1, 'method' : method, 'etype' : etype, 'engine' : engine,
-                                 'org_type' : wurec['org_type'], 'country' : wurec['country'],
+                  if not wurec: continue
+                  trecs[tkey] = {'ip' : ip, 'dsid' : dsid, 'date' : cdate, 'time' : time, 'quarter' : quarter,
+                                 'size' : dsize, 'fcount' : 1, 'method' : method, 'etype' : etype,
+                                 'engine' : engine, 'org_type' : wurec['org_type'], 'country' : wurec['country'],
                                  'email' : wurec['email']}
             else:
                # 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:
@@ -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.14.dist-info → rda_python_metrics-1.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.14
+Version: 1.0.16
 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.14.dist-info → rda_python_metrics-1.0.16.dist-info}/RECORD

@@ -3,7 +3,7 @@ rda_python_metrics/PgView.py,sha256=r6otb3DjfiaQJdg0z8bZQAOlhr4JnrXJzp9wgWh_8qQ,
 rda_python_metrics/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 rda_python_metrics/fillawsusage.py,sha256=dpI3-EFINJECdCSUOm37A97CJNIxOS2nYwA0fB0IpHE,9055
 rda_python_metrics/fillawsusage.usg,sha256=pD_nYTfg1so9nvVEyPSWdgKvb9gWdtfHJAs3RsT2MMU,609
-rda_python_metrics/fillcdgusage.py,sha256=jMAE7qFreYKqVw5XFXdGeBiLGGbdkmVQopPffuLQueg,15773
+rda_python_metrics/fillcdgusage.py,sha256=qywG_w01-DGCnRBV8fQ3ceziGMaO6s0mVU0_ebo_q-4,15764
 rda_python_metrics/fillcdgusage.usg,sha256=5lkd4Zdi72nQcha-JtbaLnxl66V4wBDykKwQtUOtMrw,667
 rda_python_metrics/fillcodusage.py,sha256=Hp3VrlIqHBWRI6Zjbi0nxWZPNvPrKsGBSZ1L9qA9_y0,8006
 rda_python_metrics/fillcodusage.usg,sha256=3B5IkQ4uwylqY8uEfUdnZ_MXqhYudeylMp5ulhUGXH8,678
@@ -44,9 +44,9 @@ rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmj
 rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
 rda_python_metrics/viewwebusage.py,sha256=jhoHuRPVNtp7Lbjv0l-Jy_vp2p2nWQC7IVZ0P4JUJ4I,16657
 rda_python_metrics/viewwebusage.usg,sha256=IsT72v22xyZf7ng_IodVs0dLTsH1Q4BtFvT-gs0-xJY,9946
-rda_python_metrics-1.0.14.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.14.dist-info/METADATA,sha256=tsmYaJjL-cWMvnpC8_WI-4IndMKtidtW9695gUlprBM,736
-rda_python_metrics-1.0.14.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-rda_python_metrics-1.0.14.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
-rda_python_metrics-1.0.14.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.14.dist-info/RECORD,,
+rda_python_metrics-1.0.16.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.16.dist-info/METADATA,sha256=u_9Qr2dLsq5ub0XFoN8PQ4UPS1kKMP5l4r_mEgcSxUg,736
+rda_python_metrics-1.0.16.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+rda_python_metrics-1.0.16.dist-info/entry_points.txt,sha256=YfFLzlE3rdufSV471VsDnfYptnt1lR08aSrxPXlKqlY,1185
+rda_python_metrics-1.0.16.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.16.dist-info/RECORD,,