Changeset 19456

Timestamp:

03/28/19 21:26:04 (6 years ago)

Author:

tbretz

Message:

Use the script location as the root path for relative file locations.

Location:

trunk/FACT++/src

Files:

• InterpreterV8.cc (modified) (4 diffs)
• InterpreterV8.h (modified) (1 diff)

trunk/FACT++/src/InterpreterV8.cc

@@ -10 +10 @@
 
 #include <boost/tokenizer.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/algorithm/string/join.hpp>
 
@@ -745 +746 @@
         return ThrowException(String::New("File name empty."));
 
-    izstream fin(*file);
+    const auto path = boost::filesystem::path(*file);
+
+    const auto f = path.is_absolute() ? path : boost::filesystem::path(fIncludePath)/path;
+
+    izstream fin(f.string().c_str());
     if (!fin)
         return ThrowException(String::New(errno!=0?strerror(errno):"Insufficient memory for decompression"));
@@ -780 +785 @@
     HandleScope handle_scope;
 
-    izstream fin(*file);
+    const auto path = boost::filesystem::path(*file);
+
+    const auto f = path.is_absolute() ? path : boost::filesystem::path(fIncludePath)/path;
+
+    izstream fin(f.string().c_str());
     if (!fin)
         return ThrowException(String::New(errno!=0?strerror(errno):"Insufficient memory for decompression"));
@@ -2804 +2813 @@
         else
         {
+            fIncludePath = boost::filesystem::path(filename).parent_path().string();
+
             // We call script->Run because it is the only way to
             // catch exceptions.

trunk/FACT++/src/InterpreterV8.h

@@ -58 +58 @@
     std::list<Database*> fDatabases;
 #endif
+
+    std::string fIncludePath;
 
 #ifdef HAVE_V8