cleanup madis changes

akrherz · Jan 25, 2023 · 200e57a · 200e57a
1 parent 6f5835c
commit 200e57a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scripts/ingestors/madis/extract_hfmetar.py b/scripts/ingestors/madis/extract_hfmetar.py
@@ -265,7 +265,7 @@ def find_fn(argv):
     for i in range(start, 5):
         ts = utcnow - datetime.timedelta(hours=i)
         for j in range(300, -1, -1):
-            fn = ts.strftime(f"/mesonet/data/madis/hfmetar/%Y%m%d_%H00{j}.nc")
+            fn = ts.strftime(f"/mesonet/data/madis/hfmetar/%Y%m%d_%H00_{j}.nc")
             if os.path.isfile(fn):
                 return fn
     LOG.warning("no MADIS HFMETAR file found!")

diff --git a/scripts/outgoing/madis2csv.py b/scripts/outgoing/madis2csv.py
@@ -39,9 +39,10 @@ def main():
     utc = datetime.datetime.utcnow()
     fn = None
     for i in range(300, -1, -1):
-        fn = f"/mesonet/data/madis/mesonet1/{utc:%Y%m%d_%H}00_{i}.nc"
-        if not os.path.isfile(fn):
+        testfn = f"/mesonet/data/madis/mesonet1/{utc:%Y%m%d_%H}00_{i}.nc"
+        if not os.path.isfile(testfn):
             continue
+        fn = testfn
         LOG.info("Found %s", fn)
         break
     if fn is None: