Mercurial > hg > orthanc

changeset 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 af7ea91dd4d5
children 3200223f9ade
files OrthancServer/OrthancFindRequestHandler.cpp OrthancServer/OrthancRestApi/OrthancRestSystem.cpp OrthancServer/QueryRetrieveHandler.cpp OrthancServer/ServerContext.h OrthancServer/main.cpp
diffstat 5 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/OrthancFindRequestHandler.cpp	Sat May 19 18:11:40 2018 +0200
+++ b/OrthancServer/OrthancFindRequestHandler.cpp	Mon May 21 08:59:04 2018 +0200
@@ -486,7 +486,7 @@
   {
     static const char* LUA_CALLBACK = "IncomingFindRequestFilter";
 
-    LuaScripting::Locker locker(context_.GetLua());
+    LuaScripting::Locker locker(context_.GetLuaScripting());
     if (!locker.GetLua().IsExistingFunction(LUA_CALLBACK))
     {
       return false;
--- a/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Sat May 19 18:11:40 2018 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Mon May 21 08:59:04 2018 +0200
@@ -124,7 +124,7 @@
     call.BodyToString(command);
 
     {
-      LuaScripting::Locker locker(context.GetLua());
+      LuaScripting::Locker locker(context.GetLuaScripting());
       locker.GetLua().Execute(result, command);
     }
 
--- a/OrthancServer/QueryRetrieveHandler.cpp	Sat May 19 18:11:40 2018 +0200
+++ b/OrthancServer/QueryRetrieveHandler.cpp	Mon May 21 08:59:04 2018 +0200
@@ -46,7 +46,7 @@
   {
     static const char* LUA_CALLBACK = "OutgoingFindRequestFilter";
 
-    LuaScripting::Locker locker(context.GetLua());
+    LuaScripting::Locker locker(context.GetLuaScripting());
     if (locker.GetLua().IsExistingFunction(LUA_CALLBACK))
     {
       LuaFunctionCall call(locker.GetLua(), LUA_CALLBACK);
--- a/OrthancServer/ServerContext.h	Sat May 19 18:11:40 2018 +0200
+++ b/OrthancServer/ServerContext.h	Mon May 21 08:59:04 2018 +0200
@@ -44,7 +44,6 @@
 #include "../Core/DicomParsing/ParsedDicomFile.h"
 #include "../Core/FileStorage/IStorageArea.h"
 #include "../Core/JobsEngine/JobsEngine.h"
-#include "../Core/Lua/LuaContext.h"
 #include "../Core/MultiThreading/SharedMessageQueue.h"
 #include "../Core/RestApi/RestApiOutput.h"
 #include "../Plugins/Engine/OrthancPlugins.h"
@@ -258,7 +257,7 @@
       return defaultLocalAet_;
     }
 
-    LuaScripting& GetLua()
+    LuaScripting& GetLuaScripting()
     {
       return lua_;
     }
--- 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())