Mercurial > hg > orthanc

diff OrthancServer/main.cpp @ 4031:e3b3af80732d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jun 2020 21:31:13 +0200
parents 05a363186da6
children
line wrap: on
line diff
--- a/OrthancServer/main.cpp	Tue Jun 09 20:50:20 2020 +0200
+++ b/OrthancServer/main.cpp	Tue Jun 09 21:31:13 2020 +0200
@@ -41,17 +41,17 @@
 #include "../Core/DicomNetworking/DicomAssociationParameters.h"
 #include "../Core/DicomNetworking/DicomServer.h"
 #include "../Core/DicomParsing/FromDcmtkBridge.h"
-#include "../Core/HttpServer/EmbeddedResourceHttpHandler.h"
 #include "../Core/HttpServer/FilesystemHttpHandler.h"
 #include "../Core/HttpServer/HttpServer.h"
 #include "../Core/Logging.h"
 #include "../Core/Lua/LuaFunctionCall.h"
 #include "../Plugins/Engine/OrthancPlugins.h"
+#include "EmbeddedResourceHttpHandler.h"
 #include "OrthancConfiguration.h"
 #include "OrthancFindRequestHandler.h"
+#include "OrthancGetRequestHandler.h"
 #include "OrthancInitialization.h"
 #include "OrthancMoveRequestHandler.h"
-#include "OrthancGetRequestHandler.h"
 #include "ServerContext.h"
 #include "ServerJobs/StorageCommitmentScpJob.h"
 #include "ServerToolbox.h"
@@ -1152,7 +1152,7 @@
   
   // Secondly, apply the "static resources" layer
 #if ORTHANC_STANDALONE == 1
-  EmbeddedResourceHttpHandler staticResources("/app", EmbeddedResources::ORTHANC_EXPLORER);
+  EmbeddedResourceHttpHandler staticResources("/app", ServerResources::ORTHANC_EXPLORER);
 #else
   FilesystemHttpHandler staticResources("/app", ORTHANC_PATH "/OrthancExplorer");
 #endif
@@ -1566,7 +1566,7 @@
     {
       // TODO WHAT IS THE ENCODING?
       std::string configurationSample;
-      GetFileResource(configurationSample, EmbeddedResources::CONFIGURATION_SAMPLE);
+      GetFileResource(configurationSample, ServerResources::CONFIGURATION_SAMPLE);
 
 #if defined(_WIN32)
       // Replace UNIX newlines with DOS newlines