Mercurial > hg > orthanc
comparison 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 |
comparison
equal
deleted
inserted
replaced
4030:100fbe970762 | 4031:e3b3af80732d |
---|---|
38 #include "../../Core/Logging.h" | 38 #include "../../Core/Logging.h" |
39 #include "../../Core/SQLite/Transaction.h" | 39 #include "../../Core/SQLite/Transaction.h" |
40 #include "../Search/ISqlLookupFormatter.h" | 40 #include "../Search/ISqlLookupFormatter.h" |
41 #include "../ServerToolbox.h" | 41 #include "../ServerToolbox.h" |
42 | 42 |
43 #include <OrthancEmbeddedResources.h> | 43 #include <ServerResources.h> |
44 | 44 |
45 #include <stdio.h> | 45 #include <stdio.h> |
46 #include <boost/lexical_cast.hpp> | 46 #include <boost/lexical_cast.hpp> |
47 | 47 |
48 namespace Orthanc | 48 namespace Orthanc |
392 | 392 |
393 if (!db_.DoesTableExist("GlobalProperties")) | 393 if (!db_.DoesTableExist("GlobalProperties")) |
394 { | 394 { |
395 LOG(INFO) << "Creating the database"; | 395 LOG(INFO) << "Creating the database"; |
396 std::string query; | 396 std::string query; |
397 EmbeddedResources::GetFileResource(query, EmbeddedResources::PREPARE_DATABASE); | 397 ServerResources::GetFileResource(query, ServerResources::PREPARE_DATABASE); |
398 db_.Execute(query); | 398 db_.Execute(query); |
399 } | 399 } |
400 | 400 |
401 // Check the version of the database | 401 // Check the version of the database |
402 std::string tmp; | 402 std::string tmp; |
428 if (!LookupGlobalProperty(tmp, GlobalProperty_GetTotalSizeIsFast) || | 428 if (!LookupGlobalProperty(tmp, GlobalProperty_GetTotalSizeIsFast) || |
429 tmp != "1") | 429 tmp != "1") |
430 { | 430 { |
431 LOG(INFO) << "Installing the SQLite triggers to track the size of the attachments"; | 431 LOG(INFO) << "Installing the SQLite triggers to track the size of the attachments"; |
432 std::string query; | 432 std::string query; |
433 EmbeddedResources::GetFileResource(query, EmbeddedResources::INSTALL_TRACK_ATTACHMENTS_SIZE); | 433 ServerResources::GetFileResource(query, ServerResources::INSTALL_TRACK_ATTACHMENTS_SIZE); |
434 db_.Execute(query); | 434 db_.Execute(query); |
435 } | 435 } |
436 } | 436 } |
437 | 437 |
438 t.Commit(); | 438 t.Commit(); |
442 db_.Register(signalRemainingAncestor_); | 442 db_.Register(signalRemainingAncestor_); |
443 } | 443 } |
444 | 444 |
445 | 445 |
446 static void ExecuteUpgradeScript(SQLite::Connection& db, | 446 static void ExecuteUpgradeScript(SQLite::Connection& db, |
447 EmbeddedResources::FileResourceId script) | 447 ServerResources::FileResourceId script) |
448 { | 448 { |
449 std::string upgrade; | 449 std::string upgrade; |
450 EmbeddedResources::GetFileResource(upgrade, script); | 450 ServerResources::GetFileResource(upgrade, script); |
451 db.BeginTransaction(); | 451 db.BeginTransaction(); |
452 db.Execute(upgrade); | 452 db.Execute(upgrade); |
453 db.CommitTransaction(); | 453 db.CommitTransaction(); |
454 } | 454 } |
455 | 455 |
473 } | 473 } |
474 | 474 |
475 if (version_ == 3) | 475 if (version_ == 3) |
476 { | 476 { |
477 LOG(WARNING) << "Upgrading database version from 3 to 4"; | 477 LOG(WARNING) << "Upgrading database version from 3 to 4"; |
478 ExecuteUpgradeScript(db_, EmbeddedResources::UPGRADE_DATABASE_3_TO_4); | 478 ExecuteUpgradeScript(db_, ServerResources::UPGRADE_DATABASE_3_TO_4); |
479 version_ = 4; | 479 version_ = 4; |
480 } | 480 } |
481 | 481 |
482 if (version_ == 4) | 482 if (version_ == 4) |
483 { | 483 { |
484 LOG(WARNING) << "Upgrading database version from 4 to 5"; | 484 LOG(WARNING) << "Upgrading database version from 4 to 5"; |
485 ExecuteUpgradeScript(db_, EmbeddedResources::UPGRADE_DATABASE_4_TO_5); | 485 ExecuteUpgradeScript(db_, ServerResources::UPGRADE_DATABASE_4_TO_5); |
486 version_ = 5; | 486 version_ = 5; |
487 } | 487 } |
488 | 488 |
489 if (version_ == 5) | 489 if (version_ == 5) |
490 { | 490 { |