@@ -1144,7 +1144,7 @@ ClassMethod NormalizeInternalName(ByRef name As %String, Output fromWebApp As %B
1144
1144
if (name [ " /" ) && (type = " csp" ) {
1145
1145
set cspFilename = $System .CSP .GetFileName (name )
1146
1146
if (cspFilename '= " " ) && (cspFilename [ ..TempFolder ()) {
1147
- set name = ..NameToInternalName (cspFilename )
1147
+ set name = ..NameToInternalName (cspFilename ,,,, 0 )
1148
1148
set fromWebApp = 1
1149
1149
} else {
1150
1150
kill cspFilename
@@ -2190,7 +2190,7 @@ ClassMethod FileIsMapped(InternalName As %String) As %Boolean
2190
2190
NameToInternalName(name): given a Unix-style slash path relative to repo root,
2191
2191
returns the internal name for that file (e.g., cls/SourceControl/Git/Utils.cls -> SourceControl.Git.Utils.CLS)
2192
2192
*/
2193
- ClassMethod NameToInternalName (Name , IgnorePercent = 1 , IgnoreNonexistent = 1 , Verbose As %Boolean = 0 ) As %String
2193
+ ClassMethod NameToInternalName (Name , IgnorePercent = 1 , IgnoreNonexistent = 1 , Verbose As %Boolean = 0 , normalize As %Boolean = 1 ) As %String
2194
2194
{
2195
2195
set InternalName =" "
2196
2196
set Deleted = 0
@@ -2206,7 +2206,7 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
2206
2206
set InternalName = ##class (SourceControl.Git.File ).ExternalNameToInternalName (Name )
2207
2207
if (InternalName '= " " ) && (context .IsInGitEnabledPackage ) {
2208
2208
// Don't need mappings!
2209
- return ..NormalizeInternalName (InternalName )
2209
+ return $select ( normalize : ..NormalizeInternalName (InternalName ), 1 : InternalName )
2210
2210
}
2211
2211
} else {
2212
2212
// check for file in uncommitted queue
@@ -2349,7 +2349,7 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
2349
2349
}
2350
2350
if ((IgnorePercent )&&($extract (InternalName )=" %" )) { set InternalName = " " } // don't return a result for % items if instructed to ignore them
2351
2351
if ((IgnoreNonexistent )&&('##class (%RoutineMgr ).Exists (InternalName ))&&('Deleted )) { set InternalName = " " } // only return item names which exist in the DB
2352
- quit ..NormalizeInternalName (InternalName )
2352
+ return $select ( normalize : ..NormalizeInternalName (InternalName ), 1 : InternalName )
2353
2353
}
2354
2354
2355
2355
ClassMethod OutputConfigureMessage ()
0 commit comments