Merge pull request mbari-org#260 from MBARIMike/main

Allow fnv_load() to not set missions_saved as is done with --fnv
ksalamy · Jun 12, 2024 · dc5a17c · dc5a17c
2 parents 903664c + f45d346
commit dc5a17c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -46,7 +46,7 @@
       //"args": [ "-v", "1", "--skipuntil_regex", "--regex", "2023/20230310m1/ZTopo.grd$", "--limit", "10" ],
       //"args": [ "-v", "1", "--skipuntil_regex", "--regex", "2024/20240510m1/ZTopo.grd$", "--limit", "10" ],
       //"args": [ "-v", "1", "--skipuntil_regex", "--regex", "MappingAUVOps2008/20080320/ZTopo.grd$", "--limit", "3" ],
-      "args": [ "-v", "1", "--skipuntil_regex", "--regex", "swathdata/surveys/NOAA/AHI-06-05ZTopo.grd$", "--limit", "2" ],
+      //"args": [ "-v", "1", "--skipuntil_regex", "--regex", "swathdata/surveys/NOAA/AHI-06-05ZTopo.grd$", "--limit", "2" ],
       //"args": ["-v", "1", "--limit", "5", "--clobber", "--noinput"],
       //"args": ["--bootstrap", "-v 1", "--clobber", "--limit", "5", "--noinput"],
       //"args": ["--bootstrap", "-v 2", "--limit", "10" "--clobber", "--noinput"],
@@ -69,7 +69,7 @@
       //"args": ["--fnv", "-v", "2", "--limit", "2", "--skipuntil", "2022/20220205m1"]
       //"args": ["--fnv", "-v", "2", "--limit", "2", "--skipuntil", "2020/20200804m1"]
       //"args": ["--fnv", "-v", "2", "--limit", "2", "--skipuntil", "2023/20230310m1"]
-      //"args": ["--fnv", "-v", "2", "--limit", "2", "--skipuntil", "swathdata/surveys/NOAA/AHI-06-05"]
+      "args": ["--fnv", "-v", "2", "--limit", "2", "--skipuntil", "swathdata/surveys/NOAA/AHI-06-05"]
       //"args": ["--fnv", "-v", "2"],
       //"args": [ "--compilation", "-v", "1", "--skipuntil", "swathdata/surveys/UH/kok0714", "--log_file", "compilation.txt" ],
       // Supporting Compilation load testing, first mission found in --compilation: 2019/20190627d1/multibeam

diff --git a/smdb/scripts/load.py b/smdb/scripts/load.py
@@ -1850,7 +1850,7 @@ def run(*args):
     elif bl.args.mbinfo:
         mbinfo_load()
     elif bl.args.fnv:
-        fnv_load(missions_saved)
+        fnv_load()
     elif bl.args.compilation:
         compilation_load()
     elif bl.args.spreadsheets:
@@ -1896,7 +1896,7 @@ def mbinfo_load():
     mbs.update_missions("mbinfo_update_mission_data")
 
 
-def fnv_load(missions_saved: list):
+def fnv_load(missions_saved: list = None):
     fnv = FNVLoader()
     fnv.process_command_line()
     fnv.update_missions("fnv_update_mission_data", missions_saved)