@@ -4393,20 +4393,20 @@ void fcall_rescanlibrary( lk::invoke_t &cxt )
43934393 else if (type == " wave" )
43944394 {
43954395 wxString wave_resource_db = SamApp::GetUserLocalDataDir () + " /WaveResourceData.csv" ;
4396- ScanWaveResourceData (wave_resource_db, true );
4396+ ScanWaveResourceData (wave_resource_db, false );
43974397 reloaded = Library::Load (wave_resource_db);
43984398 }
43994399 else if (type == " wave_ts" )
44004400 {
44014401 wxString wave_resource_ts_db = SamApp::GetUserLocalDataDir () + " /WaveResourceTSData.csv" ;
44024402 wxString wave_resource_db = SamApp::GetRuntimePath () + " ../wave_resource/test_time_series_jpd.csv" ;
4403- ScanWaveResourceTSData (wave_resource_ts_db, true );
4403+ ScanWaveResourceTSData (wave_resource_ts_db, false );
44044404 reloaded = Library::Load (wave_resource_ts_db);
44054405 }
44064406 else if (type == " tidal" )
44074407 {
44084408 wxString tidal_resource_db = SamApp::GetUserLocalDataDir () + " /TidalResourceData.csv" ;
4409- ScanTidalResourceData (tidal_resource_db, true );
4409+ ScanTidalResourceData (tidal_resource_db, false );
44104410 reloaded = Library::Load (tidal_resource_db);
44114411 }
44124412
@@ -4671,7 +4671,8 @@ void fcall_make_jpd_multiyear(lk::invoke_t& cxt)
46714671 csv (1 , 1 ) = " " ;
46724672 csv (1 , 2 ) = " " ;
46734673 csv (1 , 3 ) = " " ;
4674- csv (1 , 0 ) = wxString (final_file).substr (0 , wxString (final_file).Find (" .csv" ));
4674+ csv (1 , 0 ) = wxFileNameFromPath (final_file);
4675+ // csv(1, 0) = wxString(final_file).substr(0, wxString(final_file).Find(".csv"));
46754676
46764677
46774678 csv.WriteFile (final_file);
@@ -4725,6 +4726,7 @@ void fcall_make_jpd_multiyear(lk::invoke_t& cxt)
47254726 // lc->ReloadLibrary();
47264727 // }
47274728 // }
4729+ cxt.result ().assign (" " );
47284730 return ;
47294731}
47304732
0 commit comments