Handle relative file:// and local files, always returning an absolute path

sjoelund · sjoelund · commit ce40b4d3ddb2 · 2013-05-03T04:27:11.000Z
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15970 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -1913,12 +1913,11 @@ algorithm
       end while;
       filename := if isMatch then filename + matches[3] else filename;
     elseif isFileUriAbsolute then
-      (,matches) := regex(uri,"file://(/.*)?",2);
+      (,matches) := regex(uri,"file://(/.*)?",2,caseInsensitive=true);
       filename := matches[2];
     elseif isFileUri and not isFileUriAbsolute then
-      str := "file:// schema without absolute paths are not supported: " + uri;
-      print(str + "\n");
-      filename := "";
+      (,matches) := regex(uri,"file://(.*)",2,caseInsensitive=true);
+      filename := realpath("./") + "/" + matches[2];
       return;
     elseif not (isModelicaUri or isFileUri) then
       /* Not using else because OpenModelica handling of assertions at runtime is not very good */
@@ -1930,7 +1929,7 @@ algorithm
       /* empty */
     end if;
   else
-    filename := uri;
+    filename := if regularFileExists(uri) then realpath(uri) else if regexBool(uri, "^/") then uri else (realpath("./") + "/" + uri);
   end if;
 annotation(Documentation(info="<html>
 Handles modelica:// and file:// URI's. The result is an absolute path on the local system.
