Merge pull request #2048 from AllenInstitute/bugfix/2048-fix_loaddata…

…wrapper AB: bugfix LoadDataWrapper excluded loaded waves if the casing was di…
AllenInstitute · Mar 12, 2024 · 32da968 · 32da968
2 parents 150ab94 + 49fbb29
commit 32da968
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Packages/MIES/MIES_AnalysisBrowser.ipf b/Packages/MIES/MIES_AnalysisBrowser.ipf
@@ -627,7 +627,7 @@ static Function AB_LoadDataWrapper(tmpDFR, expFilePath, datafolderPath, listOfNa
 
 	RemoveAllEmptyDataFolders(tmpDFR)
 
-	regexp = ConvertListToRegexpWithAlternations(listOfNames)
+	regexp = "(?i)" + ConvertListToRegexpWithAlternations(listOfNames)
 	list = GetListOfObjects(tmpDFR, regexp, recursive=1, typeFlag=typeFlags)
 
 	return ItemsInList(list)

diff --git a/Packages/tests/Basic/UTF_AnalysisBrowserTest.ipf b/Packages/tests/Basic/UTF_AnalysisBrowserTest.ipf
@@ -91,3 +91,25 @@ static Function TryLoadingDifferentFiles()
 	KillWindow $abWin
 	KillWindow $sBrowser1
 End
+
+static Function TestAB_LoadDataWrapper()
+
+	variable numLoaded
+	string expFilePath
+	string expName = "TestAB_LoadDataWrapper.pxp"
+	string wName = "wAvE1"
+
+	WAVE/Z wv =root:WAVE1
+	KillOrMoveToTrash(wv=wv)
+	wName = UpperStr(wName)
+	Make root:$wName
+	SaveExperiment/P=home as expName
+
+	PathInfo home
+	expFilePath = S_path + expName
+
+	DFREF tmpDFR = NewFreeDataFolder()
+	wName = LowerStr(wName) + ";"
+	numLoaded = MIES_AB#AB_LoadDataWrapper(tmpDFR, expFilePath, "root:", wName, typeFlags=COUNTOBJECTS_WAVES)
+	CHECK_GT_VAR(numLoaded, 0)
+End