mnt: sundry updates

akrherz · Dec 28, 2023 · d8ae60f · d8ae60f
1 parent 184742a
commit d8ae60f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 27 deletions.
diff --git a/htdocs/geojson/cf6.py b/htdocs/geojson/cf6.py
@@ -3,7 +3,7 @@
 
 import simplejson as json
 from pyiem.reference import TRACE_VALUE
-from pyiem.util import get_dbconnc, html_escape
+from pyiem.util import html_escape
 from pyiem.webutil import iemapp
 from pymemcache.client import Client
 from simplejson import encoder
@@ -45,9 +45,8 @@ def f2_sanitize(val):
     return round(val, 2)
 
 
-def get_data(ts, fmt):
+def get_data(cursor, ts, fmt):
     """Get the data for this timestamp"""
-    pgconn, cursor = get_dbconnc("iem")
     data = {"type": "FeatureCollection", "features": []}
     # Fetch the daily values
     cursor.execute(
@@ -119,11 +118,10 @@ def get_data(ts, fmt):
             else:
                 res += "%s," % (val,)
         res += "\n"
-    pgconn.close()
     return res
 
 
-@iemapp()
+@iemapp(iemdb="iem", iemdb_cursorname="cursor")
 def application(environ, start_response):
     """see how we are called"""
     dt = environ.get("dt", datetime.date.today().strftime("%Y-%m-%d"))
@@ -145,7 +143,7 @@ def application(environ, start_response):
     mc = Client("iem-memcached:11211")
     res = mc.get(mckey)
     if not res:
-        res = get_data(ts, fmt)
+        res = get_data(environ["iemdb.iem.cursor"], ts, fmt)
         mc.set(mckey, res, 300)
     else:
         res = res.decode("utf-8")

diff --git a/htdocs/geojson/snowfall.py b/htdocs/geojson/snowfall.py
@@ -3,7 +3,7 @@
 import json
 
 from pyiem.reference import TRACE_VALUE
-from pyiem.util import get_dbconnc, html_escape
+from pyiem.util import html_escape
 from pyiem.webutil import iemapp
 from pymemcache.client import Client
 
@@ -19,9 +19,8 @@ def sanitize(val):
     return val
 
 
-def get_data(ts):
+def get_data(cursor, ts):
     """Get the data for this timestamp"""
-    pgconn, cursor = get_dbconnc("iem")
     data = {"type": "FeatureCollection", "features": []}
     # Fetch the daily values
     cursor.execute(
@@ -53,11 +52,10 @@ def get_data(ts):
                 },
             }
         )
-    pgconn.close()
     return json.dumps(data)
 
 
-@iemapp()
+@iemapp(iemdb="iem", iemdb_cursorname="cursor")
 def application(environ, start_response):
     """see how we are called"""
     dt = environ.get("dt", datetime.date.today().strftime("%Y-%m-%d"))
@@ -69,7 +67,7 @@ def application(environ, start_response):
     mc = Client("iem-memcached:11211")
     res = mc.get(mckey)
     if not res:
-        res = get_data(ts)
+        res = get_data(environ["iemdb.iem.cursor"], ts)
         mc.set(mckey, res, 300)
     else:
         res = res.decode("utf-8")

diff --git a/htdocs/plotting/auto/scripts/p47.py b/htdocs/plotting/auto/scripts/p47.py
@@ -27,7 +27,12 @@ def get_description():
             label="Select Station:",
             network="IACLIMATE",
         ),
-        dict(type="month", name="month", default="12", label="Select Month:"),
+        {
+            "type": "month",
+            "name": "month",
+            "default": "12",
+            "label": "Select Month:",
+        },
         dict(
             type="year",
             name="year",

diff --git a/htdocs/plotting/auto/scripts/p71.py b/htdocs/plotting/auto/scripts/p71.py
@@ -99,13 +99,12 @@ def plotter(fdict):
                 SELECT extract(year from day) as year,
                 to_char(day, 'mmdd') as sday,
                 day, avg_sknt as sknt, vector_avg_drct as drct
-                from summary s JOIN stations t
-                ON (t.iemid = s.iemid) WHERE t.id = %s and t.network = %s and
+                from summary s WHERE iemid = %s and
                 extract(month from day) = %s and avg_sknt is not null
                 and vector_avg_drct is not null ORDER by day ASC
         """,
             conn,
-            params=(station, ctx["network"], month),
+            params=(ctx["_nt"].sts[station]["iemid"], month),
             parse_dates=["day"],
         )
     title = (

diff --git a/htdocs/sites/current.php b/htdocs/sites/current.php
@@ -214,17 +214,19 @@ function make_shef_table($data, $iscurrent){
     } // End if
     $table .= "</table>";
 
-    // Cloud Levels
-    $skyc = $json["last_ob"]["skycover[code]"];
-    $skyl = $json["last_ob"]["skylevel[ft]"];
-    for ($i = 0; $i < 4; $i++) {
-        if (is_null($skyc[$i])) continue;
-        $table .= sprintf(
-            "<b>Cloud Layer %s</b>: %s (%s feet)<br />",
-            $i + 1,
-            $skyc[$i],
-            $skyl[$i]
-        );
+    if (array_key_exists("last_ob", $json)){
+        // Cloud Levels
+        $skyc = $json["last_ob"]["skycover[code]"];
+        $skyl = $json["last_ob"]["skylevel[ft]"];
+        for ($i = 0; $i < 4; $i++) {
+            if (is_null($skyc[$i])) continue;
+            $table .= sprintf(
+                "<b>Cloud Layer %s</b>: %s (%s feet)<br />",
+                $i + 1,
+                $skyc[$i],
+                $skyl[$i]
+            );
+        }
     }
 }