Index: TECH/Files.cls.xml =================================================================== diff -u -r1908 -r1911 --- TECH/Files.cls.xml (.../Files.cls.xml) (revision 1908) +++ TECH/Files.cls.xml (.../Files.cls.xml) (revision 1911) @@ -37,28 +37,17 @@ else set Delim = "\" If $extract(Directory,$length(Directory))'=Delim set Directory = Directory_Delim If $extract(Filename)=Delim Set Filename = $extract(Filename,2,$length(Filename)) - #dim resFilename As %String = ..RemoveIllegalCharacters(Directory_Filename) + #dim resFilename As %String = Directory _ ..RemoveIllegalCharacters(Filename) Quit resFilename ]]> 1 -FileOrDirectory:%String +Filename:%String 1 %String -|*?""","") - } elseif $$$StartsWith($$$LCase(FileOrDirectory),"http") { - set Result = FileOrDirectory - } else { - #dim FirstPart As TECH.String = $piece(FileOrDirectory,":",1) - #dim SecondPart As TECH.String = $piece(FileOrDirectory,":",2,$length(FileOrDirectory,":")) - set Result = FirstPart_":"_$translate(SecondPart,":<>|*?""","") - } - quit Result +|*?""","") ]]> Index: vhUnitTest/TECH/Files.cls.xml =================================================================== diff -u -r1904 -r1911 --- vhUnitTest/TECH/Files.cls.xml (.../Files.cls.xml) (revision 1904) +++ vhUnitTest/TECH/Files.cls.xml (.../Files.cls.xml) (revision 1911) @@ -18,6 +18,8 @@ do $$$AssertEquals(##class(TECH.Files).AppendFile("http://www.google.be/","/test.html"),"http://www.google.be/test.html") do $$$AssertEquals(##class(TECH.Files).AppendFile("http://www.google.be/","test.html"),"http://www.google.be/test.html") + do $$$AssertEquals(##class(TECH.Files).AppendFile("http://www.google.be:81/","test.html"),"http://www.google.be:81/test.html") + do $$$AssertEquals(##class(TECH.Files).AppendFile("\\server\share\folder\","file.ext"),"\\server\share\folder\file.ext") do $$$AssertEquals(##class(TECH.Files).AppendFile("\\server\share\folder\","fi:?le.ext"),"\\server\share\folder\file.ext") ]]>