Merge pull request #508 from intersystems/issue-495

Fix hl7 extensions inconsistencies

Author: isc-tleavitt

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed prompts in configure from 0/1 to no/yes (#461)
 - Added warnings when user is using incompatible git version (#488)
 - Fixed the back button navigation between WebUI and Settings page (#361)
+- Fixed issues with HL7 file extension inconsistencies (#495)
 - Basic mode Sync operation now imports items changed on the remote merge branch (#506)
 - Fetch diff output uses correct remote branch (#509)
 - Properly handle more cases of truncated filenames from git pull (#511)

cls/SourceControl/Git/Utils.cls

@@ -632,7 +632,36 @@ ClassMethod NormalizeFolder(folder As %String) As %String
 
 ClassMethod ExternalName(InternalName As %String, ByRef MappingExists As %Boolean) As %String
 {
-    quit $Replace(..Name(.InternalName,.MappingExists),"/",..#Slash)
+    set root = ..TempFolder()
+    set file = $Replace(..Name(.InternalName,.MappingExists),"/",..#Slash)
+    set fullFile = root_file
+    if '..Exists(.fullFile) {
+        quit file
+    }
+    quit $Piece(fullFile,root,2,*)
+}
+
+/// Check if file exists but case insensitive on file extension
+/// Stolen from %IPM.Utils.File
+ClassMethod Exists(ByRef pFilename) As %Boolean
+{
+	If ##class(%File).Exists(pFilename) {
+		Return 1
+	}
+	Set tDirectory = ##class(%File).ParentDirectoryName(pFilename)
+	If '##class(%File).DirectoryExists(tDirectory) {
+		Return 0
+	}
+	Set tName = $Piece(pFilename, tDirectory, 2, *)
+	Set tFileName = $Piece(tName, ".", 1, * - 1)
+	Set tFileExt = $Piece(tName, ".", *)
+	for tExt = $$$LOWER(tFileExt), $$$UPPER(tFileExt) {
+		If ##class(%File).Exists(tDirectory _ tFileName _ "." _ tExt) {
+			Set pFilename = tDirectory _ tFileName _ "." _ tExt
+			Return 1
+		}
+	}
+	Return 0
 }
 
 ClassMethod AddToServerSideSourceControl(InternalName As %String) As %Status
@@ -2711,3 +2740,4 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
+