orthanc: OrthancServer/ServerIndex.cpp annotate

annotate OrthancServer/ServerIndex.cpp @ 1238:6c07108ff1e2

cleaning

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 05 Dec 2014 16:14:57 +0100
parents	0f3716b88af7
children	92c6b3b57699

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
689 2d0a347e8cfc switch to 2014 Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Belgium
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	10 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	11 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	12 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	15 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	16 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	17 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	18 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	19 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	20 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 108 diff changeset	21 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "PrecompiledHeadersServer.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "ServerIndex.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
6 9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	36 #ifndef NOMINMAX
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	37 #define NOMINMAX
6 9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	38 #endif
9d483cf71d17 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	39
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	40 #include "ServerIndexChange.h"
8 3a584803783e build with visual studio jodogne parents: 6 diff changeset	41 #include "EmbeddedResources.h"
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	42 #include "OrthancInitialization.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include "../Core/Toolbox.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include "../Core/Uuid.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include "../Core/DicomFormat/DicomArray.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include "FromDcmtkBridge.h"
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	47 #include "ServerContext.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 #include <stdio.h>
108 a6e41de88a53 using glog Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	51 #include <glog/logging.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	53 static const uint64_t MEGA_BYTES = 1024 * 1024;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	54
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	55 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 namespace Internals
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 {
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	59 class ServerIndexListener : public IServerIndexListener
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	60 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	61 private:
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	62 struct FileToRemove
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	63 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	64 private:
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	65 std::string uuid_;
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	66 FileContentType type_;
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	67
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	68 public:
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	69 FileToRemove(const FileInfo& info) : uuid_(info.GetUuid()),
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	70 type_(info.GetContentType())
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	71 {
bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	72 }
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	73
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	74 const std::string& GetUuid() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	75 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	76 return uuid_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	77 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	78
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	79 FileContentType GetContentType() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	80 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	81 return type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	82 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	83 };
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	84
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	85 ServerContext& context_;
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	86 bool hasRemainingLevel_;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	87 ResourceType remainingType_;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	88 std::string remainingPublicId_;
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	89 std::list<FileToRemove> pendingFilesToRemove_;
1196 669bb978d52e rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1191 diff changeset	90 std::list<ServerIndexChange> pendingChanges_;
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	91 uint64_t sizeOfFilesToRemove_;
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	92 bool insideTransaction_;
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	93
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	94 void Reset()
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	95 {
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	96 sizeOfFilesToRemove_ = 0;
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	97 hasRemainingLevel_ = false;
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	98 pendingFilesToRemove_.clear();
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	99 pendingChanges_.clear();
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	100 }
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	101
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	102 public:
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	103 ServerIndexListener(ServerContext& context) : context_(context),
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	104 insideTransaction_(false)
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	105 {
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	106 Reset();
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	107 assert(ResourceType_Patient < ResourceType_Study &&
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	108 ResourceType_Study < ResourceType_Series &&
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	109 ResourceType_Series < ResourceType_Instance);
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	110 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	111
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	112 void StartTransaction()
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	113 {
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	114 Reset();
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	115 insideTransaction_ = true;
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	116 }
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	117
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	118 void EndTransaction()
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	119 {
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	120 insideTransaction_ = false;
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	121 }
5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	122
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	123 uint64_t GetSizeOfFilesToRemove()
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	124 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	125 return sizeOfFilesToRemove_;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	126 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	127
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	128 void CommitFilesToRemove()
5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	129 {
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	130 for (std::list<FileToRemove>::const_iterator
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	131 it = pendingFilesToRemove_.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	132 it != pendingFilesToRemove_.end(); ++it)
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	133 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	134 context_.RemoveFile(it->GetUuid(), it->GetContentType());
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	135 }
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	136 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	137
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	138 void CommitChanges()
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	139 {
1196 669bb978d52e rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 1191 diff changeset	140 for (std::list<ServerIndexChange>::const_iterator
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	141 it = pendingChanges_.begin();
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	142 it != pendingChanges_.end(); it++)
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	143 {
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	144 context_.SignalChange(*it);
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	145 }
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	146 }
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	147
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	148 virtual void SignalRemainingAncestor(ResourceType parentType,
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	149 const std::string& publicId)
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	150 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	151 LOG(INFO) << "Remaining ancestor \"" << publicId << "\" (" << parentType << ")";
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	152
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	153 if (hasRemainingLevel_)
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	154 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	155 if (parentType < remainingType_)
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	156 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	157 remainingType_ = parentType;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	158 remainingPublicId_ = publicId;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	159 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	160 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	161 else
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	162 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	163 hasRemainingLevel_ = true;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	164 remainingType_ = parentType;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	165 remainingPublicId_ = publicId;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	166 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	167 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	168
273 d384af918264 more detailed signal about deleted file Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	169 virtual void SignalFileDeleted(const FileInfo& info)
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	170 {
273 d384af918264 more detailed signal about deleted file Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	171 assert(Toolbox::IsUuid(info.GetUuid()));
1126 bf67431a7383 handling of file content type in IStorageArea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	172 pendingFilesToRemove_.push_back(FileToRemove(info));
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	173 sizeOfFilesToRemove_ += info.GetCompressedSize();
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	174 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	175
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	176 virtual void SignalChange(const ServerIndexChange& change)
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1148 diff changeset	177 {
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	178 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type "
1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	179 << EnumerationToString(change.GetResourceType()) << ": "
1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	180 << EnumerationToString(change.GetChangeType());
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	181
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	182 if (insideTransaction_)
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	183 {
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	184 pendingChanges_.push_back(change);
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	185 }
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	186 else
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	187 {
1198 1169528a9a5f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1196 diff changeset	188 context_.SignalChange(change);
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	189 }
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1148 diff changeset	190 }
badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1148 diff changeset	191
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	192 bool HasRemainingLevel() const
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	193 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	194 return hasRemainingLevel_;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	195 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	196
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	197 ResourceType GetRemainingType() const
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	198 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	199 assert(HasRemainingLevel());
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	200 return remainingType_;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	201 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	202
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	203 const std::string& GetRemainingPublicId() const
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	204 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	205 assert(HasRemainingLevel());
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	206 return remainingPublicId_;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	207 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	208 };
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	212 class ServerIndex::Transaction
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	213 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	214 private:
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	215 ServerIndex& index_;
1235 9b4977e3c19d abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	216 std::auto_ptr<SQLite::ITransaction> transaction_;
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	217 bool isCommitted_;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	218
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	219 public:
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	220 Transaction(ServerIndex& index) :
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	221 index_(index),
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	222 isCommitted_(false)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	223 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	224 assert(index_.currentStorageSize_ == index_.db_->GetTotalCompressedSize());
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	225
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	226 transaction_.reset(index_.db_->StartTransaction());
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	227 transaction_->Begin();
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	228
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	229 index_.listener_->StartTransaction();
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	230 }
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	231
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	232 ~Transaction()
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	233 {
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	234 index_.listener_->EndTransaction();
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	235 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	236
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	237 void Commit(uint64_t sizeOfAddedFiles)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	238 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	239 if (!isCommitted_)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	240 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	241 transaction_->Commit();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	242
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	243 // We can remove the files once the SQLite transaction has
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	244 // been successfully committed. Some files might have to be
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	245 // deleted because of recycling.
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	246 index_.listener_->CommitFilesToRemove();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	247
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	248 index_.currentStorageSize_ += sizeOfAddedFiles;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	249
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	250 assert(index_.currentStorageSize_ >= index_.listener_->GetSizeOfFilesToRemove());
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	251 index_.currentStorageSize_ -= index_.listener_->GetSizeOfFilesToRemove();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	252
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	253 assert(index_.currentStorageSize_ == index_.db_->GetTotalCompressedSize());
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	254
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	255 // Send all the pending changes to the Orthanc plugins
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	256 index_.listener_->CommitChanges();
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	257
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	258 isCommitted_ = true;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	259 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	260 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	261 };
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	262
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	263
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	264 class ServerIndex::UnstableResourcePayload
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	265 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	266 private:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	267 ResourceType type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	268 std::string publicId_;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	269 boost::posix_time::ptime time_;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	270
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	271 public:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	272 UnstableResourcePayload() : type_(ResourceType_Instance)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	273 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	274 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	275
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	276 UnstableResourcePayload(Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	277 const std::string& publicId) :
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	278 type_(type),
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	279 publicId_(publicId)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	280 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	281 time_ = boost::posix_time::second_clock::local_time();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	282 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	283
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	284 unsigned int GetAge() const
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	285 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	286 return (boost::posix_time::second_clock::local_time() - time_).total_seconds();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	287 }
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	288
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	289 ResourceType GetResourceType() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	290 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	291 return type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	292 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	293
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	294 const std::string& GetPublicId() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	295 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	296 return publicId_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	297 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	298 };
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	299
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	300
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 206 diff changeset	301 bool ServerIndex::DeleteResource(Json::Value& target,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 const std::string& uuid,
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	303 ResourceType expectedType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	305 boost::mutex::scoped_lock lock(mutex_);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	306
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	307 Transaction t(*this);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	308
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	309 int64_t id;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	310 ResourceType type;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	311 if (!db_->LookupResource(uuid, id, type) \|\|
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	312 expectedType != type)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	316
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	317 db_->DeleteResource(id);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	319 if (listener_->HasRemainingLevel())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 {
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	321 ResourceType type = listener_->GetRemainingType();
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	322 const std::string& uuid = listener_->GetRemainingPublicId();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 target["RemainingAncestor"] = Json::Value(Json::objectValue);
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	325 target["RemainingAncestor"]["Path"] = GetBasePath(type, uuid);
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	326 target["RemainingAncestor"]["Type"] = EnumerationToString(type);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 target["RemainingAncestor"]["ID"] = uuid;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 target["RemainingAncestor"] = Json::nullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	334 t.Commit(0);
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	335
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 return true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	340 void ServerIndex::FlushThread(ServerIndex* that)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	341 {
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	342 // By default, wait for 10 seconds before flushing
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	343 unsigned int sleep = 10;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	344
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	345 try
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	346 {
744 ec69658b031b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 739 diff changeset	347 boost::mutex::scoped_lock lock(that->mutex_);
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	348 std::string sleepString = that->db_->GetGlobalProperty(GlobalProperty_FlushSleep, "");
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	349
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	350 if (Toolbox::IsInteger(sleepString))
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	351 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	352 sleep = boost::lexical_cast<unsigned int>(sleepString);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	353 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	354 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	355 catch (boost::bad_lexical_cast&)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	356 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	357 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	358
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	359 LOG(INFO) << "Starting the database flushing thread (sleep = " << sleep << ")";
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	360
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	361 unsigned int count = 0;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	362
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	363 while (!that->done_)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	364 {
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	365 boost::this_thread::sleep(boost::posix_time::seconds(1));
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	366 count++;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	367 if (count < sleep)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	368 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	369 continue;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	370 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	371
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	372 boost::mutex::scoped_lock lock(that->mutex_);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	373 that->db_->FlushToDisk();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	374 count = 0;
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	375 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	376
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	377 LOG(INFO) << "Stopping the database flushing thread";
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	378 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	379
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	380
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	381 static void ComputeExpectedNumberOfInstances(DatabaseWrapper& db,
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	382 int64_t series,
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	383 const DicomMap& dicomSummary)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	384 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	385 try
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	386 {
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	387 const DicomValue* value;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	388 const DicomValue* value2;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	389
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	390 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL &&
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	391 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	392 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	393 // Patch for series with temporal positions thanks to Will Ryder
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	394 int64_t imagesInAcquisition = boost::lexical_cast<int64_t>(value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	395 int64_t countTemporalPositions = boost::lexical_cast<int64_t>(value2->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	396 std::string expected = boost::lexical_cast<std::string>(imagesInAcquisition * countTemporalPositions);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	397 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, expected);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	398 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	399
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	400 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL &&
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	401 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TIME_SLICES)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	402 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	403 // Support of Cardio-PET images
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	404 int64_t numberOfSlices = boost::lexical_cast<int64_t>(value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	405 int64_t numberOfTimeSlices = boost::lexical_cast<int64_t>(value2->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	406 std::string expected = boost::lexical_cast<std::string>(numberOfSlices * numberOfTimeSlices);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	407 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, expected);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	408 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	409
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	410 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	411 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	412 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	413 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	414 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	415 catch (boost::bad_lexical_cast)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	416 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	417 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	418 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	419
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	420
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	421
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	422
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	423 bool ServerIndex::GetMetadataAsInteger(int64_t& result,
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	424 int64_t id,
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	425 MetadataType type)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	426 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	427 std::string s;
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	428 if (!db_->LookupMetadata(s, id, type))
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	429 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	430 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	431 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	432
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	433 try
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	434 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	435 result = boost::lexical_cast<int64_t>(s);
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	436 return true;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	437 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	438 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	439 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	440 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	441 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	442 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	443
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	444
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	445
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	446 uint64_t ServerIndex::IncrementGlobalSequenceInternal(GlobalProperty property)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	447 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	448 std::string oldValue;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	449
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	450 if (db_->LookupGlobalProperty(oldValue, property))
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	451 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	452 uint64_t oldNumber;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	453
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	454 try
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	455 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	456 oldNumber = boost::lexical_cast<uint64_t>(oldValue);
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	457 db_->SetGlobalProperty(property, boost::lexical_cast<std::string>(oldNumber + 1));
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	458 return oldNumber + 1;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	459 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	460 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	461 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	462 throw OrthancException(ErrorCode_InternalError);
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	463 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	464 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	465 else
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	466 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	467 // Initialize the sequence at "1"
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	468 db_->SetGlobalProperty(property, "1");
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	469 return 1;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	470 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	471 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	472
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	473
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	474
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	475 ServerIndex::ServerIndex(ServerContext& context,
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	476 const std::string& dbPath) :
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	477 done_(false),
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	478 maximumStorageSize_(0),
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	479 maximumPatients_(0)
186 f68c039b0571 preparing refactoring of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 180 diff changeset	480 {
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	481 listener_.reset(new Internals::ServerIndexListener(context));
186 f68c039b0571 preparing refactoring of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 180 diff changeset	482
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	483 if (dbPath == ":memory:")
180 626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	484 {
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	485 db_.reset(new DatabaseWrapper(*listener_));
180 626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	486 }
626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	487 else
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 {
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	489 boost::filesystem::path p = dbPath;
180 626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	490
626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	491 try
626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	492 {
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	493 boost::filesystem::create_directories(p);
180 626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	494 }
626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	495 catch (boost::filesystem::filesystem_error)
626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	496 {
626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	497 }
626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	498
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	499 db_.reset(new DatabaseWrapper(p.string() + "/index", *listener_));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 }
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	501
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	502 currentStorageSize_ = db_->GetTotalCompressedSize();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	503
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	504 // Initial recycling if the parameters have changed since the last
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	505 // execution of Orthanc
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	506 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	507
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	508 flushThread_ = boost::thread(FlushThread, this);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	509 unstableResourcesMonitorThread_ = boost::thread(UnstableResourcesMonitorThread, this);
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	510 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	511
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	512
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	513 ServerIndex::~ServerIndex()
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	514 {
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	515 done_ = true;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	516
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	517 if (flushThread_.joinable())
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	518 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	519 flushThread_.join();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	520 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	521
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	522 if (unstableResourcesMonitorThread_.joinable())
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	523 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	524 unstableResourcesMonitorThread_.join();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	525 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	529 StoreStatus ServerIndex::Store(std::map<MetadataType, std::string>& instanceMetadata,
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	530 const DicomMap& dicomSummary,
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	531 const Attachments& attachments,
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	532 const std::string& remoteAet,
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	533 const MetadataMap& metadata)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	535 boost::mutex::scoped_lock lock(mutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	537 instanceMetadata.clear();
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	538
178 5739b4d10a4b hashing Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	539 DicomInstanceHasher hasher(dicomSummary);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 {
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	543 Transaction t(*this);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	545 // Do nothing if the instance already exists
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 {
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	547 ResourceType type;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	548 int64_t tmp;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	549 if (db_->LookupResource(hasher.HashInstance(), tmp, type))
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	550 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	551 assert(type == ResourceType_Instance);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	552 db_->GetAllMetadata(instanceMetadata, tmp);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	553 return StoreStatus_AlreadyStored;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	554 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	557 // Ensure there is enough room in the storage for the new instance
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	558 uint64_t instanceSize = 0;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	559 for (Attachments::const_iterator it = attachments.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	560 it != attachments.end(); ++it)
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	561 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	562 instanceSize += it->GetCompressedSize();
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	563 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	564
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	565 Recycle(instanceSize, hasher.HashPatient());
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	566
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	567 // Create the instance
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	568 int64_t instance = db_->CreateResource(hasher.HashInstance(), ResourceType_Instance);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	569
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	570 DicomMap dicom;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	571 dicomSummary.ExtractInstanceInformation(dicom);
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	572 db_->SetMainDicomTags(instance, dicom);
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	573
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	574 // Detect up to which level the patient/study/series/instance
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	575 // hierarchy must be created
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	576 int64_t patient = -1, study = -1, series = -1;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	577 bool isNewPatient = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	578 bool isNewStudy = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	579 bool isNewSeries = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	580
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 {
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	582 ResourceType dummy;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	583
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	584 if (db_->LookupResource(hasher.HashSeries(), series, dummy))
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	585 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	586 assert(dummy == ResourceType_Series);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	587 // The patient, the study and the series already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	588
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	589 bool ok = (db_->LookupResource(hasher.HashPatient(), patient, dummy) &&
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	590 db_->LookupResource(hasher.HashStudy(), study, dummy));
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	591 assert(ok);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	592 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	593 else if (db_->LookupResource(hasher.HashStudy(), study, dummy))
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	594 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	595 assert(dummy == ResourceType_Study);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	596
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	597 // New series: The patient and the study already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	598 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	599
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	600 bool ok = db_->LookupResource(hasher.HashPatient(), patient, dummy);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	601 assert(ok);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	602 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	603 else if (db_->LookupResource(hasher.HashPatient(), patient, dummy))
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	604 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	605 assert(dummy == ResourceType_Patient);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	606
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	607 // New study and series: The patient already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	608 isNewStudy = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	609 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	610 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	611 else
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	612 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	613 // New patient, study and series: Nothing exists
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	614 isNewPatient = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	615 isNewStudy = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	616 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	617 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	618 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	619
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	620 // Create the series if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	621 if (isNewSeries)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	622 {
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	623 series = db_->CreateResource(hasher.HashSeries(), ResourceType_Series);
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	624 dicomSummary.ExtractSeriesInformation(dicom);
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	625 db_->SetMainDicomTags(series, dicom);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	626 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	627
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	628 // Create the study if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	629 if (isNewStudy)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	630 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	631 study = db_->CreateResource(hasher.HashStudy(), ResourceType_Study);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	632 dicomSummary.ExtractStudyInformation(dicom);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	633 db_->SetMainDicomTags(study, dicom);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	634 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	635
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	636 // Create the patient if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	637 if (isNewPatient)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	638 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	639 patient = db_->CreateResource(hasher.HashPatient(), ResourceType_Patient);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	640 dicomSummary.ExtractPatientInformation(dicom);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	641 db_->SetMainDicomTags(patient, dicom);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	642 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	643
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	644 // Create the parent-to-child links
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	645 db_->AttachChild(series, instance);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	646
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	647 if (isNewSeries)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	648 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	649 db_->AttachChild(study, series);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 }
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	651
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	652 if (isNewStudy)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 {
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	654 db_->AttachChild(patient, study);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	657 // Sanity checks
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	658 assert(patient != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	659 assert(study != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	660 assert(series != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	661 assert(instance != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	662
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	663 // Attach the files to the newly created instance
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	664 for (Attachments::const_iterator it = attachments.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	665 it != attachments.end(); ++it)
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	666 {
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	667 db_->AddAttachment(instance, *it);
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	668 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	669
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	670 // Attach the user-specified metadata
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	671 for (MetadataMap::const_iterator
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	672 it = metadata.begin(); it != metadata.end(); ++it)
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	673 {
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	674 switch (it->first.first)
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	675 {
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	676 case ResourceType_Patient:
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	677 db_->SetMetadata(patient, it->first.second, it->second);
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	678 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	679
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	680 case ResourceType_Study:
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	681 db_->SetMetadata(study, it->first.second, it->second);
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	682 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	683
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	684 case ResourceType_Series:
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	685 db_->SetMetadata(series, it->first.second, it->second);
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	686 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	687
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	688 case ResourceType_Instance:
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	689 db_->SetMetadata(instance, it->first.second, it->second);
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	690 instanceMetadata[it->first.second] = it->second;
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	691 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	692
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	693 default:
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	694 throw OrthancException(ErrorCode_ParameterOutOfRange);
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	695 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	696 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	697
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	698 // Attach the auto-computed metadata for the patient/study/series levels
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	699 std::string now = Toolbox::GetNowIsoString();
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	700 db_->SetMetadata(series, MetadataType_LastUpdate, now);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	701 db_->SetMetadata(study, MetadataType_LastUpdate, now);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	702 db_->SetMetadata(patient, MetadataType_LastUpdate, now);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	703
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	704 // Attach the auto-computed metadata for the instance level,
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	705 // reflecting these additions into the input metadata map
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	706 db_->SetMetadata(instance, MetadataType_Instance_ReceptionDate, now);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	707 instanceMetadata[MetadataType_Instance_ReceptionDate] = now;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	708
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	709 db_->SetMetadata(instance, MetadataType_Instance_RemoteAet, remoteAet);
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	710 instanceMetadata[MetadataType_Instance_RemoteAet] = remoteAet;
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	711
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	712 const DicomValue* value;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	713 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL \|\|
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	714 (value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 {
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	716 db_->SetMetadata(instance, MetadataType_Instance_IndexInSeries, value->AsString());
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	717 instanceMetadata[MetadataType_Instance_IndexInSeries] = value->AsString();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	718 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	720 // Check whether the series of this new instance is now completed
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	721 if (isNewSeries)
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	722 {
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	723 ComputeExpectedNumberOfInstances(*db_, series, dicomSummary);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	724 }
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	725
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	726 SeriesStatus seriesStatus = GetSeriesStatus(series);
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	727 if (seriesStatus == SeriesStatus_Complete)
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	728 {
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	729 LogChange(series, ChangeType_CompletedSeries, ResourceType_Series, hasher.HashSeries());
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	730 }
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	731
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	732 // Mark the parent resources of this instance as unstable
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	733 MarkAsUnstable(series, ResourceType_Series, hasher.HashSeries());
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	734 MarkAsUnstable(study, ResourceType_Study, hasher.HashStudy());
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	735 MarkAsUnstable(patient, ResourceType_Patient, hasher.HashPatient());
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	736
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	737 t.Commit(instanceSize);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	738
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 return StoreStatus_Success;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 }
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	741 catch (OrthancException& e)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 {
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	743 LOG(ERROR) << "EXCEPTION [" << e.What() << "]"
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	744 << " (SQLite status: " << db_->GetErrorMessage() << ")";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	745 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	746
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 return StoreStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	750
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	751 void ServerIndex::ComputeStatistics(Json::Value& target)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	752 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	753 boost::mutex::scoped_lock lock(mutex_);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	754 target = Json::objectValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	755
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	756 uint64_t cs = currentStorageSize_;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	757 assert(cs == db_->GetTotalCompressedSize());
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	758 uint64_t us = db_->GetTotalUncompressedSize();
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	759 target["TotalDiskSize"] = boost::lexical_cast<std::string>(cs);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	760 target["TotalUncompressedSize"] = boost::lexical_cast<std::string>(us);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	761 target["TotalDiskSizeMB"] = boost::lexical_cast<unsigned int>(cs / MEGA_BYTES);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	762 target["TotalUncompressedSizeMB"] = boost::lexical_cast<unsigned int>(us / MEGA_BYTES);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	763
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	764 target["CountPatients"] = static_cast<unsigned int>(db_->GetResourceCount(ResourceType_Patient));
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	765 target["CountStudies"] = static_cast<unsigned int>(db_->GetResourceCount(ResourceType_Study));
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	766 target["CountSeries"] = static_cast<unsigned int>(db_->GetResourceCount(ResourceType_Series));
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	767 target["CountInstances"] = static_cast<unsigned int>(db_->GetResourceCount(ResourceType_Instance));
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	768 }
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	769
187 8e673a65564d refactoring of storing new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	770
8e673a65564d refactoring of storing new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	771
585 b2357f1f026f fix types jodogne parents: 521 diff changeset	772 SeriesStatus ServerIndex::GetSeriesStatus(int64_t id)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	773 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	774 // Get the expected number of instances in this series (from the metadata)
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	775 int64_t expected;
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	776 if (!GetMetadataAsInteger(expected, id, MetadataType_Series_ExpectedNumberOfInstances))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	777 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	778 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	779 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	780
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	781 // Loop over the instances of this series
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	782 std::list<int64_t> children;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	783 db_->GetChildrenInternalId(children, id);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	784
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	785 std::set<int64_t> instances;
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	786 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	787 it = children.begin(); it != children.end(); ++it)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	788 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	789 // Get the index of this instance in the series
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	790 int64_t index;
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	791 if (!GetMetadataAsInteger(index, *it, MetadataType_Instance_IndexInSeries))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	792 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	793 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	794 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	795
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	796 if (!(index > 0 && index <= expected))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	797 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	798 // Out-of-range instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	799 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	800 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	801
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	802 if (instances.find(index) != instances.end())
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	803 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	804 // Twice the same instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	805 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	806 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	807
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	808 instances.insert(index);
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	809 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	810
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	811 if (static_cast<int64_t>(instances.size()) == expected)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	812 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	813 return SeriesStatus_Complete;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	814 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	815 else
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	816 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	817 return SeriesStatus_Missing;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	818 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	819 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	820
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	821
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	822
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	823 void ServerIndex::MainDicomTagsToJson(Json::Value& target,
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	824 int64_t resourceId)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	825 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	826 DicomMap tags;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	827 db_->GetMainDicomTags(tags, resourceId);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	828 target["MainDicomTags"] = Json::objectValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	829 FromDcmtkBridge::ToJson(target["MainDicomTags"], tags);
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	830 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	831
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	832 bool ServerIndex::LookupResource(Json::Value& result,
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	833 const std::string& publicId,
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	834 ResourceType expectedType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	835 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	836 result = Json::objectValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	837
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	838 boost::mutex::scoped_lock lock(mutex_);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	839
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	840 // Lookup for the requested resource
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	841 int64_t id;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	842 ResourceType type;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	843 if (!db_->LookupResource(publicId, id, type) \|\|
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	844 type != expectedType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	845 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	846 return false;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	847 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	848
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	849 // Find the parent resource (if it exists)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	850 if (type != ResourceType_Patient)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	851 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	852 int64_t parentId;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	853 if (!db_->LookupParent(parentId, id))
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	854 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	855 throw OrthancException(ErrorCode_InternalError);
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	856 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	857
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	858 std::string parent = db_->GetPublicId(parentId);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	859
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	860 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	861 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	862 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	863 result["ParentPatient"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	864 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	865
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	866 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	867 result["ParentStudy"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	868 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	869
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	870 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	871 result["ParentSeries"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	872 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	873
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	874 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	875 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	876 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	877 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	878
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	879 // List the children resources
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	880 std::list<std::string> children;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	881 db_->GetChildrenPublicId(children, id);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	882
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	883 if (type != ResourceType_Instance)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	884 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	885 Json::Value c = Json::arrayValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	886
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	887 for (std::list<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	888 it = children.begin(); it != children.end(); ++it)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	889 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	890 c.append(*it);
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	891 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	892
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	893 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	894 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	895 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	896 result["Studies"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	897 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	898
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	899 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	900 result["Series"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	901 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	902
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	903 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	904 result["Instances"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	905 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	906
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	907 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	908 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	909 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	910 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	911
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	912 // Set the resource type
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	913 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	914 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	915 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	916 result["Type"] = "Patient";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	917 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	918
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	919 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	920 result["Type"] = "Study";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	921 break;
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	922
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	923 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	924 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	925 result["Type"] = "Series";
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	926 result["Status"] = EnumerationToString(GetSeriesStatus(id));
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	927
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	928 int64_t i;
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	929 if (GetMetadataAsInteger(i, id, MetadataType_Series_ExpectedNumberOfInstances))
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	930 result["ExpectedNumberOfInstances"] = static_cast<int>(i);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	931 else
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	932 result["ExpectedNumberOfInstances"] = Json::nullValue;
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	933
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	934 break;
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	935 }
9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	936
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	937 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	938 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	939 result["Type"] = "Instance";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	940
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	941 FileInfo attachment;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	942 if (!db_->LookupAttachment(attachment, id, FileContentType_Dicom))
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	943 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	944 throw OrthancException(ErrorCode_InternalError);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	945 }
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	946
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	947 result["FileSize"] = static_cast<unsigned int>(attachment.GetUncompressedSize());
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	948 result["FileUuid"] = attachment.GetUuid();
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	949
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	950 int64_t i;
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	951 if (GetMetadataAsInteger(i, id, MetadataType_Instance_IndexInSeries))
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	952 result["IndexInSeries"] = static_cast<int>(i);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	953 else
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	954 result["IndexInSeries"] = Json::nullValue;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	955
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	956 break;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	957 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	958
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	959 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	960 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	961 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	962
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	963 // Record the remaining information
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	964 result["ID"] = publicId;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	965 MainDicomTagsToJson(result, id);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	966
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	967 std::string tmp;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	968
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	969 if (db_->LookupMetadata(tmp, id, MetadataType_AnonymizedFrom))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	970 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	971 result["AnonymizedFrom"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	972 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	973
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	974 if (db_->LookupMetadata(tmp, id, MetadataType_ModifiedFrom))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	975 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	976 result["ModifiedFrom"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	977 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	978
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	979 if (type == ResourceType_Patient \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	980 type == ResourceType_Study \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	981 type == ResourceType_Series)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	982 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	983 result["IsStable"] = !unstableResources_.Contains(id);
1148 ac36589f699e LastUpdate metadata is now always returned for patients, studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	984
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	985 if (db_->LookupMetadata(tmp, id, MetadataType_LastUpdate))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	986 {
1148 ac36589f699e LastUpdate metadata is now always returned for patients, studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	987 result["LastUpdate"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	988 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	989 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	990
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	991 return true;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	992 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	993
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	994
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	995 bool ServerIndex::LookupAttachment(FileInfo& attachment,
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	996 const std::string& instanceUuid,
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	997 FileContentType contentType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	998 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	999 boost::mutex::scoped_lock lock(mutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1000
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1001 int64_t id;
a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1002 ResourceType type;
701 f9052558eada fix attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 699 diff changeset	1003 if (!db_->LookupResource(instanceUuid, id, type))
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1004 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1005 throw OrthancException(ErrorCode_UnknownResource);
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1006 }
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1007
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1008 if (db_->LookupAttachment(attachment, id, contentType))
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1009 {
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	1010 assert(attachment.GetContentType() == contentType);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1011 return true;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1012 }
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1013 else
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1014 {
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1015 return false;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1016 }
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1017 }
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1018
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1019
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1020
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1021 void ServerIndex::GetAllUuids(Json::Value& target,
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1022 ResourceType resourceType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	1024 boost::mutex::scoped_lock lock(mutex_);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	1025 db_->GetAllPublicIds(target, resourceType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 bool ServerIndex::GetChanges(Json::Value& target,
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	1030 int64_t since,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 unsigned int maxResults)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	1033 boost::mutex::scoped_lock lock(mutex_);
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1034 db_->GetChanges(target, since, maxResults);
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1035 return true;
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1036 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1037
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1038 bool ServerIndex::GetLastChange(Json::Value& target)
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1039 {
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1040 boost::mutex::scoped_lock lock(mutex_);
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1041 db_->GetLastChange(target);
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	1042 return true;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1043 }
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1044
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1045 void ServerIndex::LogExportedResource(const std::string& publicId,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1046 const std::string& remoteModality)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1047 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1048 boost::mutex::scoped_lock lock(mutex_);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1049
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1050 int64_t id;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1051 ResourceType type;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1052 if (!db_->LookupResource(publicId, id, type))
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1053 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1054 throw OrthancException(ErrorCode_InternalError);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1055 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1056
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1057 std::string patientId;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1058 std::string studyInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1059 std::string seriesInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1060 std::string sopInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1061
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1062 int64_t currentId = id;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1063 ResourceType currentType = type;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1064
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1065 // Iteratively go up inside the patient/study/series/instance hierarchy
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1066 bool done = false;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1067 while (!done)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1068 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1069 DicomMap map;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1070 db_->GetMainDicomTags(map, currentId);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1071
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1072 switch (currentType)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1073 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1074 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1075 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1076 done = true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1077 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1078
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1079 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1080 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1081 currentType = ResourceType_Patient;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1082 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1083
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1084 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1085 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1086 currentType = ResourceType_Study;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1087 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1088
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1089 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1090 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1091 currentType = ResourceType_Series;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1092 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1093
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1094 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1095 throw OrthancException(ErrorCode_InternalError);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1096 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1097
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1098 // If we have not reached the Patient level, find the parent of
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1099 // the current resource
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1100 if (!done)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1101 {
375 d1ea72f1c967 major fix of storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1102 bool ok = db_->LookupParent(currentId, currentId);
d1ea72f1c967 major fix of storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1103 assert(ok);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1104 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1105 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1106
1235 9b4977e3c19d abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	1107 // No need for a SQLite::ITransaction here, as we only insert 1 record
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1108 db_->LogExportedResource(type,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1109 publicId,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1110 remoteModality,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1111 patientId,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1112 studyInstanceUid,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1113 seriesInstanceUid,
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1114 sopInstanceUid,
21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1115 boost::posix_time::second_clock::local_time());
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1116 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1117
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1118
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1119 bool ServerIndex::GetExportedResources(Json::Value& target,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1120 int64_t since,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1121 unsigned int maxResults)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1122 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1123 boost::mutex::scoped_lock lock(mutex_);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1124 db_->GetExportedResources(target, since, maxResults);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1125 return true;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1126 }
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1127
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1128 bool ServerIndex::GetLastExportedResource(Json::Value& target)
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1129 {
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1130 boost::mutex::scoped_lock lock(mutex_);
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1131 db_->GetLastExportedResource(target);
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1132 return true;
16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1133 }
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1134
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1135
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1136 bool ServerIndex::IsRecyclingNeeded(uint64_t instanceSize)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1137 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1138 if (maximumStorageSize_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1139 {
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1140 uint64_t currentSize = currentStorageSize_ - listener_->GetSizeOfFilesToRemove();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1141 assert(db_->GetTotalCompressedSize() == currentSize);
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1142
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1143 if (currentSize + instanceSize > maximumStorageSize_)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1144 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1145 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1146 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1147 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1148
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1149 if (maximumPatients_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1150 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1151 uint64_t patientCount = db_->GetResourceCount(ResourceType_Patient);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1152 if (patientCount > maximumPatients_)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1153 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1154 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1155 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1156 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1157
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1158 return false;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1159 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1160
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1161
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1162 void ServerIndex::Recycle(uint64_t instanceSize,
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1163 const std::string& newPatientId)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1164 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1165 if (!IsRecyclingNeeded(instanceSize))
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1166 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1167 return;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1168 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1169
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1170 // Check whether other DICOM instances from this patient are
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1171 // already stored
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1172 int64_t patientToAvoid;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1173 ResourceType type;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1174 bool hasPatientToAvoid = db_->LookupResource(newPatientId, patientToAvoid, type);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1175
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1176 if (hasPatientToAvoid && type != ResourceType_Patient)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1177 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1178 throw OrthancException(ErrorCode_InternalError);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1179 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1180
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1181 // Iteratively select patient to remove until there is enough
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1182 // space in the DICOM store
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1183 int64_t patientToRecycle;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1184 while (true)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1185 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1186 // If other instances of this patient are already in the store,
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1187 // we must avoid to recycle them
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1188 bool ok = hasPatientToAvoid ?
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1189 db_->SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1190 db_->SelectPatientToRecycle(patientToRecycle);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1191
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1192 if (!ok)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1193 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1194 throw OrthancException(ErrorCode_FullStorage);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1195 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1196
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1197 LOG(INFO) << "Recycling one patient";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1198 db_->DeleteResource(patientToRecycle);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1199
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1200 if (!IsRecyclingNeeded(instanceSize))
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1201 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1202 // OK, we're done
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1203 break;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1204 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1205 }
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1206 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1207
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1208 void ServerIndex::SetMaximumPatientCount(unsigned int count)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1209 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1210 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1211 maximumPatients_ = count;
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1212
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1213 if (count == 0)
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1214 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1215 LOG(WARNING) << "No limit on the number of stored patients";
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1216 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1217 else
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1218 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1219 LOG(WARNING) << "At most " << count << " patients will be stored";
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1220 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1221
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1222 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1223 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1224
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1225 void ServerIndex::SetMaximumStorageSize(uint64_t size)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1226 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1227 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1228 maximumStorageSize_ = size;
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1229
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1230 if (size == 0)
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1231 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1232 LOG(WARNING) << "No limit on the size of the storage area";
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1233 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1234 else
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1235 {
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1236 LOG(WARNING) << "At most " << (size / MEGA_BYTES) << "MB will be used for the storage area";
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1237 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1238
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1239 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1240 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1241
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1242 void ServerIndex::StandaloneRecycling()
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1243 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1244 // WARNING: No mutex here, do not include this as a public method
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1245 Transaction t(*this);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1246 Recycle(0, "");
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1247 t.Commit(0);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1248 }
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1249
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1250
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1251 bool ServerIndex::IsProtectedPatient(const std::string& publicId)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1252 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1253 boost::mutex::scoped_lock lock(mutex_);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1254
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1255 // Lookup for the requested resource
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1256 int64_t id;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1257 ResourceType type;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1258 if (!db_->LookupResource(publicId, id, type) \|\|
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1259 type != ResourceType_Patient)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1260 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1261 throw OrthancException(ErrorCode_ParameterOutOfRange);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1262 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1263
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1264 return db_->IsProtectedPatient(id);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1265 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1266
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1267
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1268 void ServerIndex::SetProtectedPatient(const std::string& publicId,
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1269 bool isProtected)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1270 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1271 boost::mutex::scoped_lock lock(mutex_);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1272
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1273 // Lookup for the requested resource
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1274 int64_t id;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1275 ResourceType type;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1276 if (!db_->LookupResource(publicId, id, type) \|\|
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1277 type != ResourceType_Patient)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1278 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1279 throw OrthancException(ErrorCode_ParameterOutOfRange);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1280 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1281
1235 9b4977e3c19d abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	1282 // No need for a SQLite::ITransaction here, as we only make 1 write to the DB
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1283 db_->SetProtectedPatient(id, isProtected);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1284
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1285 if (isProtected)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1286 LOG(INFO) << "Patient " << publicId << " has been protected";
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1287 else
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1288 LOG(INFO) << "Patient " << publicId << " has been unprotected";
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1289 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1290
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1291
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1292 void ServerIndex::GetChildren(std::list<std::string>& result,
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1293 const std::string& publicId)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1294 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1295 result.clear();
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1296
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1297 boost::mutex::scoped_lock lock(mutex_);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1298
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1299 ResourceType type;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1300 int64_t resource;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1301 if (!db_->LookupResource(publicId, resource, type))
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1302 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1303 throw OrthancException(ErrorCode_UnknownResource);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1304 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1305
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1306 if (type == ResourceType_Instance)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1307 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1308 // An instance cannot have a child
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1309 throw OrthancException(ErrorCode_BadParameterType);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1310 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1311
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1312 std::list<int64_t> tmp;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1313 db_->GetChildrenInternalId(tmp, resource);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1314
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1315 for (std::list<int64_t>::const_iterator
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1316 it = tmp.begin(); it != tmp.end(); ++it)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1317 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1318 result.push_back(db_->GetPublicId(*it));
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1319 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1320 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1321
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1322
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1323 void ServerIndex::GetChildInstances(std::list<std::string>& result,
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1324 const std::string& publicId)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1325 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1326 result.clear();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1327
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1328 boost::mutex::scoped_lock lock(mutex_);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1329
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1330 ResourceType type;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1331 int64_t top;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1332 if (!db_->LookupResource(publicId, top, type))
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1333 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1334 throw OrthancException(ErrorCode_UnknownResource);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1335 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1336
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1337 if (type == ResourceType_Instance)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1338 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1339 // The resource is already an instance: Do not go down the hierarchy
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1340 result.push_back(publicId);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1341 return;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1342 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1343
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1344 std::stack<int64_t> toExplore;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1345 toExplore.push(top);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1346
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1347 std::list<int64_t> tmp;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1348
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1349 while (!toExplore.empty())
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1350 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1351 // Get the internal ID of the current resource
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1352 int64_t resource = toExplore.top();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1353 toExplore.pop();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1354
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1355 if (db_->GetResourceType(resource) == ResourceType_Instance)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1356 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1357 result.push_back(db_->GetPublicId(resource));
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1358 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1359 else
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1360 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1361 // Tag all the children of this resource as to be explored
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1362 db_->GetChildrenInternalId(tmp, resource);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1363 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1364 it = tmp.begin(); it != tmp.end(); ++it)
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1365 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1366 toExplore.push(*it);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1367 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1368 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1369 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1370 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1371
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1372
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1373 void ServerIndex::SetMetadata(const std::string& publicId,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1374 MetadataType type,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1375 const std::string& value)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1376 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1377 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1378
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1379 ResourceType rtype;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1380 int64_t id;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1381 if (!db_->LookupResource(publicId, id, rtype))
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1382 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1383 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1384 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1385
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1386 db_->SetMetadata(id, type, value);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1387 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1388
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1389
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1390 void ServerIndex::DeleteMetadata(const std::string& publicId,
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1391 MetadataType type)
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1392 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1393 boost::mutex::scoped_lock lock(mutex_);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1394
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1395 ResourceType rtype;
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1396 int64_t id;
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1397 if (!db_->LookupResource(publicId, id, rtype))
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1398 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1399 throw OrthancException(ErrorCode_UnknownResource);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1400 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1401
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1402 db_->DeleteMetadata(id, type);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1403 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1404
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1405
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1406 bool ServerIndex::LookupMetadata(std::string& target,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1407 const std::string& publicId,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1408 MetadataType type)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1409 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1410 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1411
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1412 ResourceType rtype;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1413 int64_t id;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1414 if (!db_->LookupResource(publicId, id, rtype))
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1415 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1416 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1417 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1418
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1419 return db_->LookupMetadata(target, id, type);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1420 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1421
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1422
739 696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 714 diff changeset	1423 void ServerIndex::ListAvailableMetadata(std::list<MetadataType>& target,
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1424 const std::string& publicId)
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1425 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1426 boost::mutex::scoped_lock lock(mutex_);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1427
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1428 ResourceType rtype;
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1429 int64_t id;
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1430 if (!db_->LookupResource(publicId, id, rtype))
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1431 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1432 throw OrthancException(ErrorCode_UnknownResource);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1433 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1434
739 696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 714 diff changeset	1435 db_->ListAvailableMetadata(target, id);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1436 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1437
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1438
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1439 void ServerIndex::ListAvailableAttachments(std::list<FileContentType>& target,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1440 const std::string& publicId,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1441 ResourceType expectedType)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1442 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1443 boost::mutex::scoped_lock lock(mutex_);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1444
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1445 ResourceType type;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1446 int64_t id;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1447 if (!db_->LookupResource(publicId, id, type) \|\|
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1448 expectedType != type)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1449 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1450 throw OrthancException(ErrorCode_UnknownResource);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1451 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1452
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1453 db_->ListAvailableAttachments(target, id);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1454 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1455
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1456
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1457 bool ServerIndex::LookupParent(std::string& target,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1458 const std::string& publicId)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1459 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1460 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1461
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1462 ResourceType type;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1463 int64_t id;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1464 if (!db_->LookupResource(publicId, id, type))
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1465 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1466 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1467 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1468
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1469 int64_t parentId;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1470 if (db_->LookupParent(parentId, id))
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1471 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1472 target = db_->GetPublicId(parentId);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1473 return true;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1474 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1475 else
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1476 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1477 return false;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1478 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1479 }
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1480
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1481
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1482 uint64_t ServerIndex::IncrementGlobalSequence(GlobalProperty sequence)
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1483 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1484 boost::mutex::scoped_lock lock(mutex_);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1485
1235 9b4977e3c19d abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	1486 std::auto_ptr<SQLite::ITransaction> transaction(db_->StartTransaction());
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1487
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1488 transaction->Begin();
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1489 uint64_t seq = IncrementGlobalSequenceInternal(sequence);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1490 transaction->Commit();
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1491
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1492 return seq;
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1493 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1494
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1495
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1496
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1497 void ServerIndex::LogChange(ChangeType changeType,
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1498 const std::string& publicId)
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1499 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1500 boost::mutex::scoped_lock lock(mutex_);
1235 9b4977e3c19d abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	1501 std::auto_ptr<SQLite::ITransaction> transaction(db_->StartTransaction());
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1502 transaction->Begin();
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1503
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1504 int64_t id;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1505 ResourceType type;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1506 if (!db_->LookupResource(publicId, id, type))
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1507 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1508 throw OrthancException(ErrorCode_UnknownResource);
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1509 }
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1510
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1511 LogChange(id, changeType, type, publicId);
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1512
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1513 transaction->Commit();
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1514 }
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1515
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1516
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1517 void ServerIndex::DeleteChanges()
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1518 {
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1519 boost::mutex::scoped_lock lock(mutex_);
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1520 db_->ClearTable("Changes");
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1521 }
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1522
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1523 void ServerIndex::DeleteExportedResources()
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1524 {
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1525 boost::mutex::scoped_lock lock(mutex_);
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1526 db_->ClearTable("ExportedResources");
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1527 }
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1528
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1529
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1530 void ServerIndex::GetStatisticsInternal(/* out */ uint64_t& compressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1531 /* out */ uint64_t& uncompressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1532 /* out */ unsigned int& countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1533 /* out */ unsigned int& countSeries,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1534 /* out */ unsigned int& countInstances,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1535 /* in */ int64_t id,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1536 /* in */ ResourceType type)
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1537 {
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1538 std::stack<int64_t> toExplore;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1539 toExplore.push(id);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1540
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1541 countInstances = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1542 countSeries = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1543 countStudies = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1544 compressedSize = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1545 uncompressedSize = 0;
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1546
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1547 while (!toExplore.empty())
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1548 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1549 // Get the internal ID of the current resource
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1550 int64_t resource = toExplore.top();
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1551 toExplore.pop();
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1552
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1553 ResourceType thisType = db_->GetResourceType(resource);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1554
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1555 std::list<FileContentType> f;
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1556 db_->ListAvailableAttachments(f, resource);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1557
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1558 for (std::list<FileContentType>::const_iterator
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1559 it = f.begin(); it != f.end(); ++it)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1560 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1561 FileInfo attachment;
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1562 if (db_->LookupAttachment(attachment, resource, *it))
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1563 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1564 compressedSize += attachment.GetCompressedSize();
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1565 uncompressedSize += attachment.GetUncompressedSize();
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1566 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1567 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1568
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1569 if (thisType == ResourceType_Instance)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1570 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1571 countInstances++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1572 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1573 else
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1574 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1575 switch (thisType)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1576 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1577 case ResourceType_Study:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1578 countStudies++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1579 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1580
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1581 case ResourceType_Series:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1582 countSeries++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1583 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1584
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1585 default:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1586 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1587 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1588
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1589 // Tag all the children of this resource as to be explored
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1590 std::list<int64_t> tmp;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1591 db_->GetChildrenInternalId(tmp, resource);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1592 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1593 it = tmp.begin(); it != tmp.end(); ++it)
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1594 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1595 toExplore.push(*it);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1596 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1597 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1598 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1599
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1600 if (countStudies == 0)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1601 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1602 countStudies = 1;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1603 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1604
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1605 if (countSeries == 0)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1606 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1607 countSeries = 1;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1608 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1609 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1610
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1611
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1612
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1613 void ServerIndex::GetStatistics(Json::Value& target,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1614 const std::string& publicId)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1615 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1616 boost::mutex::scoped_lock lock(mutex_);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1617
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1618 ResourceType type;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1619 int64_t top;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1620 if (!db_->LookupResource(publicId, top, type))
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1621 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1622 throw OrthancException(ErrorCode_UnknownResource);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1623 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1624
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1625 uint64_t uncompressedSize;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1626 uint64_t compressedSize;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1627 unsigned int countStudies;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1628 unsigned int countSeries;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1629 unsigned int countInstances;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1630 GetStatisticsInternal(compressedSize, uncompressedSize, countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1631 countSeries, countInstances, top, type);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1632
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1633 target = Json::objectValue;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1634 target["DiskSize"] = boost::lexical_cast<std::string>(compressedSize);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1635 target["DiskSizeMB"] = boost::lexical_cast<unsigned int>(compressedSize / MEGA_BYTES);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1636 target["UncompressedSize"] = boost::lexical_cast<std::string>(uncompressedSize);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1637 target["UncompressedSizeMB"] = boost::lexical_cast<unsigned int>(uncompressedSize / MEGA_BYTES);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1638
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1639 switch (type)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1640 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1641 // Do NOT add "break" below this point!
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1642 case ResourceType_Patient:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1643 target["CountStudies"] = countStudies;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1644
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1645 case ResourceType_Study:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1646 target["CountSeries"] = countSeries;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1647
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1648 case ResourceType_Series:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1649 target["CountInstances"] = countInstances;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1650
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1651 case ResourceType_Instance:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1652 default:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1653 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1654 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1655 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1656
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1657
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1658 void ServerIndex::GetStatistics(/* out */ uint64_t& compressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1659 /* out */ uint64_t& uncompressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1660 /* out */ unsigned int& countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1661 /* out */ unsigned int& countSeries,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1662 /* out */ unsigned int& countInstances,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1663 const std::string& publicId)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1664 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1665 boost::mutex::scoped_lock lock(mutex_);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1666
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1667 ResourceType type;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1668 int64_t top;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1669 if (!db_->LookupResource(publicId, top, type))
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1670 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1671 throw OrthancException(ErrorCode_UnknownResource);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1672 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1673
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1674 GetStatisticsInternal(compressedSize, uncompressedSize, countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1675 countSeries, countInstances, top, type);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1676 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1677
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1678
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1679 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1680 {
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1681 int stableAge = Configuration::GetGlobalIntegerParameter("StableAge", 60);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1682 if (stableAge <= 0)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1683 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1684 stableAge = 60;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1685 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1686
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1687 LOG(INFO) << "Starting the monitor for stable resources (stable age = " << stableAge << ")";
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1688
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1689 while (!that->done_)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1690 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1691 // Check for stable resources each second
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1692 boost::this_thread::sleep(boost::posix_time::seconds(1));
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1693
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1694 boost::mutex::scoped_lock lock(that->mutex_);
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1695
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1696 while (!that->unstableResources_.IsEmpty() &&
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1697 that->unstableResources_.GetOldestPayload().GetAge() > static_cast<unsigned int>(stableAge))
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1698 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1699 // This DICOM resource has not received any new instance for
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1700 // some time. It can be considered as stable.
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1701
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1702 UnstableResourcePayload payload;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1703 int64_t id = that->unstableResources_.RemoveOldest(payload);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1704
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1705 // Ensure that the resource is still existing before logging the change
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1706 if (that->db_->IsExistingResource(id))
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1707 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1708 switch (payload.GetResourceType())
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1709 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1710 case ResourceType_Patient:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1711 that->LogChange(id, ChangeType_StablePatient, ResourceType_Patient, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1712 break;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1713
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1714 case ResourceType_Study:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1715 that->LogChange(id, ChangeType_StableStudy, ResourceType_Study, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1716 break;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1717
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1718 case ResourceType_Series:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1719 that->LogChange(id, ChangeType_StableSeries, ResourceType_Series, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1720 break;
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1721
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1722 default:
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1723 throw OrthancException(ErrorCode_InternalError);
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1724 }
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1725
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1726 //LOG(INFO) << "Stable resource: " << EnumerationToString(payload.type_) << " " << id;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1727 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1728 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1729 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1730
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1731 LOG(INFO) << "Closing the monitor thread for stable resources";
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1732 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1733
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1734
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1735 void ServerIndex::MarkAsUnstable(int64_t id,
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1736 Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1737 const std::string& publicId)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1738 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1739 // WARNING: Before calling this method, "mutex_" must be locked.
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1740
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1741 assert(type == Orthanc::ResourceType_Patient \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1742 type == Orthanc::ResourceType_Study \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1743 type == Orthanc::ResourceType_Series);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1744
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1745 UnstableResourcePayload payload(type, publicId);
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1746 unstableResources_.AddOrMakeMostRecent(id, payload);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1747 //LOG(INFO) << "Unstable resource: " << EnumerationToString(type) << " " << id;
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	1748
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1749 LogChange(id, ChangeType_NewChildInstance, type, publicId);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1750 }
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1751
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1752
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1753
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1754 void ServerIndex::LookupIdentifier(std::list<std::string>& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1755 const DicomTag& tag,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1756 const std::string& value,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1757 ResourceType type)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1758 {
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1759 result.clear();
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1760
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1761 boost::mutex::scoped_lock lock(mutex_);
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1762
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1763 std::list<int64_t> id;
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1764 db_->LookupIdentifier(id, tag, value);
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1765
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1766 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1767 it = id.begin(); it != id.end(); ++it)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1768 {
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1769 if (db_->GetResourceType(*it) == type)
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1770 {
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1771 result.push_back(db_->GetPublicId(*it));
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1772 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1773 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1774 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1775
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1776
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1777 void ServerIndex::LookupIdentifier(std::list<std::string>& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1778 const DicomTag& tag,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1779 const std::string& value)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1780 {
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1781 result.clear();
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1782
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1783 boost::mutex::scoped_lock lock(mutex_);
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1784
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1785 std::list<int64_t> id;
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1786 db_->LookupIdentifier(id, tag, value);
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1787
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1788 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1789 it = id.begin(); it != id.end(); ++it)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1790 {
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1791 result.push_back(db_->GetPublicId(*it));
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1792 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1793 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1794
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1795
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1796 void ServerIndex::LookupIdentifier(std::list< std::pair<ResourceType, std::string> >& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1797 const std::string& value)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1798 {
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1799 result.clear();
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1800
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1801 boost::mutex::scoped_lock lock(mutex_);
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1802
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1803 std::list<int64_t> id;
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1804 db_->LookupIdentifier(id, value);
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1805
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1806 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1807 it = id.begin(); it != id.end(); ++it)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1808 {
1139 f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1128 diff changeset	1809 result.push_back(std::make_pair(db_->GetResourceType(*it),
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1128 diff changeset	1810 db_->GetPublicId(*it)));
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1811 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1812 }
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1813
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1814
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1815 StoreStatus ServerIndex::AddAttachment(const FileInfo& attachment,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1816 const std::string& publicId)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1817 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1818 boost::mutex::scoped_lock lock(mutex_);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1819
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1820 Transaction t(*this);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1821
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1822 ResourceType resourceType;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1823 int64_t resourceId;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1824 if (!db_->LookupResource(publicId, resourceId, resourceType))
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1825 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1826 return StoreStatus_Failure; // Inexistent resource
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1827 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1828
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1829 // Remove possible previous attachment
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1830 db_->DeleteAttachment(resourceId, attachment.GetContentType());
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1831
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1832 // Locate the patient of the target resource
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1833 int64_t patientId = resourceId;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1834 for (;;)
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1835 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1836 int64_t parent;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1837 if (db_->LookupParent(parent, patientId))
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1838 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1839 // We have not reached the patient level yet
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1840 patientId = parent;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1841 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1842 else
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1843 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1844 // We have reached the patient level
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1845 break;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1846 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1847 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1848
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1849 // Possibly apply the recycling mechanism while preserving this patient
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1850 assert(db_->GetResourceType(patientId) == ResourceType_Patient);
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1851 Recycle(attachment.GetCompressedSize(), db_->GetPublicId(patientId));
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1852
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1853 db_->AddAttachment(resourceId, attachment);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1854
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1855 t.Commit(attachment.GetCompressedSize());
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1856
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1857 return StoreStatus_Success;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1858 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1859
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1860
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1861 void ServerIndex::DeleteAttachment(const std::string& publicId,
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1862 FileContentType type)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1863 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1864 boost::mutex::scoped_lock lock(mutex_);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1865
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1866 Transaction t(*this);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1867
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1868 ResourceType rtype;
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1869 int64_t id;
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1870 if (!db_->LookupResource(publicId, id, rtype))
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1871 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1872 throw OrthancException(ErrorCode_UnknownResource);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1873 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1874
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1875 db_->DeleteAttachment(id, type);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1876
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1877 t.Commit(0);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1878 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1879
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1880
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1881 bool ServerIndex::GetMetadata(Json::Value& target,
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1882 const std::string& publicId)
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1883 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1884 boost::mutex::scoped_lock lock(mutex_);
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1885
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1886 target = Json::objectValue;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1887
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1888 ResourceType type;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1889 int64_t id;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1890 if (!db_->LookupResource(publicId, id, type))
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1891 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1892 return false;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1893 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1894
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1895 std::list<MetadataType> metadata;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1896 db_->ListAvailableMetadata(metadata, id);
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1897
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1898 for (std::list<MetadataType>::const_iterator
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1899 it = metadata.begin(); it != metadata.end(); it++)
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1900 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1901 std::string key = EnumerationToString(*it);
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1902
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1903 std::string value;
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1904 if (!db_->LookupMetadata(value, id, *it))
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1905 {
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1906 value.clear();
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1907 }
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	1908
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1909 target[key] = value;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1910 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1911
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1912 return true;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1913 }
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1914
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1915
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1916 std::string ServerIndex::GetGlobalProperty(GlobalProperty property,
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1917 const std::string& defaultValue)
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1918 {
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1919 boost::mutex::scoped_lock lock(mutex_);
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1920 return db_->GetGlobalProperty(property, defaultValue);
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1921 }
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	1922
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1923 }

Mercurial > hg > orthanc

annotate OrthancServer/ServerIndex.cpp @ 1238:6c07108ff1e2