Mercurial > hg > orthanc

diff OrthancServer/main.cpp @ 2612:6f9225dcfc32 jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renames
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 May 2018 08:59:04 +0200
parents 3ff4c50647ea
children 2f3007bf0708
line wrap: on
line diff
--- a/OrthancServer/main.cpp	Sat May 19 18:11:40 2018 +0200
+++ b/OrthancServer/main.cpp	Mon May 21 08:59:04 2018 +0200
@@ -265,7 +265,7 @@
     {
       std::string lua = "Is" + configuration;
 
-      LuaScripting::Locker locker(context_.GetLua());
+      LuaScripting::Locker locker(context_.GetLuaScripting());
       
       if (locker.GetLua().IsExistingFunction(lua.c_str()))
       {
@@ -290,7 +290,7 @@
     {
       std::string lua = "Is" + std::string(configuration);
 
-      LuaScripting::Locker locker(context_.GetLua());
+      LuaScripting::Locker locker(context_.GetLuaScripting());
       
       if (locker.GetLua().IsExistingFunction(lua.c_str()))
       {
@@ -336,7 +336,7 @@
 
     static const char* HTTP_FILTER = "IncomingHttpRequestFilter";
 
-    LuaScripting::Locker locker(context_.GetLua());
+    LuaScripting::Locker locker(context_.GetLuaScripting());
 
     // Test if the instance must be filtered out
     if (locker.GetLua().IsExistingFunction(HTTP_FILTER))
@@ -652,7 +652,7 @@
     std::string script;
     SystemToolbox::ReadFile(script, path);
 
-    LuaScripting::Locker locker(context.GetLua());
+    LuaScripting::Locker locker(context.GetLuaScripting());
     locker.GetLua().Execute(script);
   }
 }
@@ -689,7 +689,7 @@
   }
 #endif
 
-  context.GetLua().Execute("Initialize");
+  context.GetLuaScripting().Execute("Initialize");
 
   bool restart;
 
@@ -723,7 +723,7 @@
     }
   }
 
-  context.GetLua().Execute("Finalize");
+  context.GetLuaScripting().Execute("Finalize");
 
 #if ORTHANC_ENABLE_PLUGINS == 1
   if (context.HasPlugins())