Mercurial > hg > orthanc
diff OrthancServer/Database/SQLiteDatabaseWrapper.cpp @ 4031:e3b3af80732d
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 | 100fbe970762 |
children | 058b5ade8acd |
line wrap: on
line diff
--- a/OrthancServer/Database/SQLiteDatabaseWrapper.cpp Tue Jun 09 20:50:20 2020 +0200 +++ b/OrthancServer/Database/SQLiteDatabaseWrapper.cpp Tue Jun 09 21:31:13 2020 +0200 @@ -40,7 +40,7 @@ #include "../Search/ISqlLookupFormatter.h" #include "../ServerToolbox.h" -#include <OrthancEmbeddedResources.h> +#include <ServerResources.h> #include <stdio.h> #include <boost/lexical_cast.hpp> @@ -394,7 +394,7 @@ { LOG(INFO) << "Creating the database"; std::string query; - EmbeddedResources::GetFileResource(query, EmbeddedResources::PREPARE_DATABASE); + ServerResources::GetFileResource(query, ServerResources::PREPARE_DATABASE); db_.Execute(query); } @@ -430,7 +430,7 @@ { LOG(INFO) << "Installing the SQLite triggers to track the size of the attachments"; std::string query; - EmbeddedResources::GetFileResource(query, EmbeddedResources::INSTALL_TRACK_ATTACHMENTS_SIZE); + ServerResources::GetFileResource(query, ServerResources::INSTALL_TRACK_ATTACHMENTS_SIZE); db_.Execute(query); } } @@ -444,10 +444,10 @@ static void ExecuteUpgradeScript(SQLite::Connection& db, - EmbeddedResources::FileResourceId script) + ServerResources::FileResourceId script) { std::string upgrade; - EmbeddedResources::GetFileResource(upgrade, script); + ServerResources::GetFileResource(upgrade, script); db.BeginTransaction(); db.Execute(upgrade); db.CommitTransaction(); @@ -475,14 +475,14 @@ if (version_ == 3) { LOG(WARNING) << "Upgrading database version from 3 to 4"; - ExecuteUpgradeScript(db_, EmbeddedResources::UPGRADE_DATABASE_3_TO_4); + ExecuteUpgradeScript(db_, ServerResources::UPGRADE_DATABASE_3_TO_4); version_ = 4; } if (version_ == 4) { LOG(WARNING) << "Upgrading database version from 4 to 5"; - ExecuteUpgradeScript(db_, EmbeddedResources::UPGRADE_DATABASE_4_TO_5); + ExecuteUpgradeScript(db_, ServerResources::UPGRADE_DATABASE_4_TO_5); version_ = 5; }