orthanc: OrthancServer/ServerIndex.cpp annotate

annotate OrthancServer/ServerIndex.cpp @ 1300:919dfb2fb3fe

DANGEROUS refactoring

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 06 Feb 2015 15:30:46 +0100
parents	4ce47e8ed0d2
children	7b6925b0890d

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
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	4 * Department, University Hospital of Liege, Belgium
0 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 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	224 transaction_.reset(index_.db_.StartTransaction());
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	225 transaction_->Begin();
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	226
1270 cf5bd2dc3b7a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1249 diff changeset	227 assert(index_.currentStorageSize_ == index_.db_.GetTotalCompressedSize());
cf5bd2dc3b7a fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1249 diff changeset	228
1191 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
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	253 // Send all the pending changes to the Orthanc plugins
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	254 index_.listener_->CommitChanges();
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	255
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	256 isCommitted_ = true;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	257 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	258 }
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
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	262 class ServerIndex::UnstableResourcePayload
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	263 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	264 private:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	265 ResourceType type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	266 std::string publicId_;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	267 boost::posix_time::ptime time_;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	268
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	269 public:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	270 UnstableResourcePayload() : type_(ResourceType_Instance)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	271 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	272 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	273
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	274 UnstableResourcePayload(Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	275 const std::string& publicId) :
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	276 type_(type),
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	277 publicId_(publicId)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	278 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	279 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	280 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	281
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	282 unsigned int GetAge() const
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 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	285 }
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	286
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	287 ResourceType GetResourceType() const
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 return type_;
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
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	292 const std::string& GetPublicId() const
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 return publicId_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	295 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	296 };
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	297
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	298
212 f276b175dcaf delete resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 206 diff changeset	299 bool ServerIndex::DeleteResource(Json::Value& target,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 const std::string& uuid,
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	301 ResourceType expectedType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	303 boost::mutex::scoped_lock lock(mutex_);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	304
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	305 Transaction t(*this);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	306
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	307 int64_t id;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	308 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	309 if (!db_.LookupResource(id, type, uuid) \|\|
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	310 expectedType != type)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 return false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	314
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	315 db_.DeleteResource(id);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	317 if (listener_->HasRemainingLevel())
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 ResourceType type = listener_->GetRemainingType();
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	320 const std::string& uuid = listener_->GetRemainingPublicId();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 target["RemainingAncestor"] = Json::Value(Json::objectValue);
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	323 target["RemainingAncestor"]["Path"] = GetBasePath(type, uuid);
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	324 target["RemainingAncestor"]["Type"] = EnumerationToString(type);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 target["RemainingAncestor"]["ID"] = uuid;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 else
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 target["RemainingAncestor"] = Json::nullValue;
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
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	332 t.Commit(0);
264 5b8e8b74bc8b remove files only after the sqlite transaction has succeeded Sebastien Jodogne <s.jodogne@gmail.com> parents: 240 diff changeset	333
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 return true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	338 void ServerIndex::FlushThread(ServerIndex* that)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	339 {
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	340 // 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	341 unsigned int sleep = 10;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	342
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	343 try
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	344 {
744 ec69658b031b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 739 diff changeset	345 boost::mutex::scoped_lock lock(that->mutex_);
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	346 std::string sleepString;
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	347
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	348 if (that->db_.LookupGlobalProperty(sleepString, GlobalProperty_FlushSleep) &&
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	349 Toolbox::IsInteger(sleepString))
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	350 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	351 sleep = boost::lexical_cast<unsigned int>(sleepString);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	352 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	353 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	354 catch (boost::bad_lexical_cast&)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	355 {
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
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	358 LOG(INFO) << "Starting the database flushing thread (sleep = " << sleep << ")";
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	359
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	360 unsigned int count = 0;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	361
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	362 while (!that->done_)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	363 {
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	364 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	365 count++;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	366 if (count < sleep)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	367 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	368 continue;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	369 }
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 boost::mutex::scoped_lock lock(that->mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	372 that->db_.FlushToDisk();
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	373 count = 0;
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	374 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	375
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	376 LOG(INFO) << "Stopping the database flushing thread";
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	377 }
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
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	380 static void ComputeExpectedNumberOfInstances(IDatabaseWrapper& db,
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	381 int64_t series,
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	382 const DicomMap& dicomSummary)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	383 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	384 try
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	385 {
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	386 const DicomValue* value;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	387 const DicomValue* value2;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	388
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	389 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL &&
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	390 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	391 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	392 // Patch for series with temporal positions thanks to Will Ryder
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	393 int64_t imagesInAcquisition = boost::lexical_cast<int64_t>(value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	394 int64_t countTemporalPositions = boost::lexical_cast<int64_t>(value2->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	395 std::string expected = boost::lexical_cast<std::string>(imagesInAcquisition * countTemporalPositions);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	396 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, expected);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	397 }
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 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL &&
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	400 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TIME_SLICES)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	401 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	402 // Support of Cardio-PET images
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	403 int64_t numberOfSlices = boost::lexical_cast<int64_t>(value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	404 int64_t numberOfTimeSlices = boost::lexical_cast<int64_t>(value2->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	405 std::string expected = boost::lexical_cast<std::string>(numberOfSlices * numberOfTimeSlices);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	406 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, expected);
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	407 }
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 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	410 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	411 db.SetMetadata(series, MetadataType_Series_ExpectedNumberOfInstances, value->AsString());
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	412 }
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 catch (boost::bad_lexical_cast)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	415 {
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
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	420
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	421
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	422 bool ServerIndex::GetMetadataAsInteger(int64_t& result,
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	423 int64_t id,
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	424 MetadataType type)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	425 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	426 std::string s;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	427 if (!db_.LookupMetadata(s, id, type))
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	428 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	429 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	430 }
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 try
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	433 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	434 result = boost::lexical_cast<int64_t>(s);
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	435 return true;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	436 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	437 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	438 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	439 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	440 }
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
1297 501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	444 void ServerIndex::LogChange(int64_t internalId,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	445 ChangeType changeType,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	446 ResourceType resourceType,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	447 const std::string& publicId)
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	448 {
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	449 ServerIndexChange change(changeType, resourceType, publicId);
1300 919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	450
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	451 if (changeType <= ChangeType_INTERNAL_LastLogged)
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	452 {
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	453 db_.LogChange(internalId, change);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	454 }
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	455
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	456 assert(listener_.get() != NULL);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	457 listener_->SignalChange(change);
1297 501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	458 }
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	459
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	460
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	461 uint64_t ServerIndex::IncrementGlobalSequenceInternal(GlobalProperty property)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	462 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	463 std::string oldValue;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	464
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	465 if (db_.LookupGlobalProperty(oldValue, property))
1237 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 uint64_t oldNumber;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	468
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	469 try
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 oldNumber = boost::lexical_cast<uint64_t>(oldValue);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	472 db_.SetGlobalProperty(property, boost::lexical_cast<std::string>(oldNumber + 1));
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	473 return oldNumber + 1;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	474 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	475 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	476 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	477 throw OrthancException(ErrorCode_InternalError);
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	478 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	479 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	480 else
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	481 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	482 // Initialize the sequence at "1"
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	483 db_.SetGlobalProperty(property, "1");
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	484 return 1;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	485 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	486 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	487
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	488
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	489
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	490 void ServerIndex::SetMainDicomTags(int64_t resource,
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	491 const DicomMap& tags)
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	492 {
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	493 DicomArray flattened(tags);
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	494 for (size_t i = 0; i < flattened.GetSize(); i++)
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	495 {
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	496 const DicomElement& element = flattened.GetElement(i);
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	497 db_.SetMainDicomTag(resource, element.GetTag(), element.GetValue().AsString());
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	498 }
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	499 }
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	500
b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	501
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	502 int64_t ServerIndex::CreateResource(const std::string& publicId,
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	503 ResourceType type)
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	504 {
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	505 int64_t id = db_.CreateResource(publicId, type);
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	506
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	507 ChangeType changeType;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	508 switch (type)
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	509 {
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	510 case ResourceType_Patient:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	511 changeType = ChangeType_NewPatient;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	512 break;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	513
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	514 case ResourceType_Study:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	515 changeType = ChangeType_NewStudy;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	516 break;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	517
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	518 case ResourceType_Series:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	519 changeType = ChangeType_NewSeries;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	520 break;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	521
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	522 case ResourceType_Instance:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	523 changeType = ChangeType_NewInstance;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	524 break;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	525
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	526 default:
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	527 throw OrthancException(ErrorCode_InternalError);
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	528 }
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	529
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	530 ServerIndexChange change(changeType, type, publicId);
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	531 db_.LogChange(id, change);
1300 919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	532
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	533 assert(listener_.get() != NULL);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	534 listener_->SignalChange(change);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	535
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	536 return id;
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	537 }
4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	538
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	539
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	540 ServerIndex::ServerIndex(ServerContext& context,
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	541 IDatabaseWrapper& db) :
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	542 done_(false),
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	543 db_(db),
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	544 maximumStorageSize_(0),
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	545 maximumPatients_(0)
186 f68c039b0571 preparing refactoring of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 180 diff changeset	546 {
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	547 listener_.reset(new Internals::ServerIndexListener(context));
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	548 db_.SetListener(*listener_);
180 626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	549
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	550 currentStorageSize_ = db_.GetTotalCompressedSize();
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	551
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	552 // 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	553 // execution of Orthanc
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	554 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	555
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	556 flushThread_ = boost::thread(FlushThread, this);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	557 unstableResourcesMonitorThread_ = boost::thread(UnstableResourcesMonitorThread, this);
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	558 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	559
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	560
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	561 ServerIndex::~ServerIndex()
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	562 {
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	563 done_ = true;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	564
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	565 if (flushThread_.joinable())
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	566 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	567 flushThread_.join();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	568 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	569
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	570 if (unstableResourcesMonitorThread_.joinable())
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	571 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	572 unstableResourcesMonitorThread_.join();
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	573 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	577 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	578 const DicomMap& dicomSummary,
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	579 const Attachments& attachments,
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	580 const std::string& remoteAet,
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	581 const MetadataMap& metadata)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	583 boost::mutex::scoped_lock lock(mutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	585 instanceMetadata.clear();
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	586
178 5739b4d10a4b hashing Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	587 DicomInstanceHasher hasher(dicomSummary);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 {
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	591 Transaction t(*this);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	593 // Do nothing if the instance already exists
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 {
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	595 ResourceType type;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	596 int64_t tmp;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	597 if (db_.LookupResource(tmp, type, hasher.HashInstance()))
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	598 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	599 assert(type == ResourceType_Instance);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	600 db_.GetAllMetadata(instanceMetadata, tmp);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	601 return StoreStatus_AlreadyStored;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	602 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	605 // 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	606 uint64_t instanceSize = 0;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	607 for (Attachments::const_iterator it = attachments.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	608 it != attachments.end(); ++it)
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	609 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	610 instanceSize += it->GetCompressedSize();
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	611 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	612
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	613 Recycle(instanceSize, hasher.HashPatient());
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	614
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	615 // Create the instance
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	616 int64_t instance = CreateResource(hasher.HashInstance(), ResourceType_Instance);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	617
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	618 DicomMap dicom;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	619 dicomSummary.ExtractInstanceInformation(dicom);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	620 SetMainDicomTags(instance, dicom);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	621
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	622 // Detect up to which level the patient/study/series/instance
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	623 // hierarchy must be created
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	624 int64_t patient = -1, study = -1, series = -1;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	625 bool isNewPatient = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	626 bool isNewStudy = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	627 bool isNewSeries = false;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	628
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629 {
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	630 ResourceType dummy;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	631
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	632 if (db_.LookupResource(series, dummy, hasher.HashSeries()))
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	633 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	634 assert(dummy == ResourceType_Series);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	635 // The patient, the study and the series already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	636
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	637 bool ok = (db_.LookupResource(patient, dummy, hasher.HashPatient()) &&
910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	638 db_.LookupResource(study, dummy, hasher.HashStudy()));
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	639 assert(ok);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	640 }
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	641 else if (db_.LookupResource(study, dummy, hasher.HashStudy()))
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	642 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	643 assert(dummy == ResourceType_Study);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	644
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	645 // New series: The patient and the study already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	646 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	647
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	648 bool ok = db_.LookupResource(patient, dummy, hasher.HashPatient());
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	649 assert(ok);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	650 }
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	651 else if (db_.LookupResource(patient, dummy, hasher.HashPatient()))
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	652 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	653 assert(dummy == ResourceType_Patient);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	654
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	655 // New study and series: The patient already exist
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	656 isNewStudy = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	657 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	658 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	659 else
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	660 {
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	661 // New patient, study and series: Nothing exists
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	662 isNewPatient = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	663 isNewStudy = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	664 isNewSeries = true;
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	665 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	666 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	667
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	668 // Create the series if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	669 if (isNewSeries)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	670 {
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	671 series = CreateResource(hasher.HashSeries(), ResourceType_Series);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	672 dicomSummary.ExtractSeriesInformation(dicom);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	673 SetMainDicomTags(series, dicom);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	674 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	675
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	676 // Create the study if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	677 if (isNewStudy)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	678 {
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	679 study = CreateResource(hasher.HashStudy(), ResourceType_Study);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	680 dicomSummary.ExtractStudyInformation(dicom);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	681 SetMainDicomTags(study, dicom);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	682 }
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	683
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	684 // Create the patient if needed
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	685 if (isNewPatient)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	686 {
1299 4ce47e8ed0d2 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1297 diff changeset	687 patient = CreateResource(hasher.HashPatient(), ResourceType_Patient);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	688 dicomSummary.ExtractPatientInformation(dicom);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	689 SetMainDicomTags(patient, dicom);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	690 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	691
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	692 // Create the parent-to-child links
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	693 db_.AttachChild(series, instance);
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	694
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	695 if (isNewSeries)
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	696 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	697 db_.AttachChild(study, series);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698 }
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	699
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	700 if (isNewStudy)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	701 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	702 db_.AttachChild(patient, study);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	705 // Sanity checks
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	706 assert(patient != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	707 assert(study != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	708 assert(series != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	709 assert(instance != -1);
2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	710
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	711 // Attach the files to the newly created instance
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	712 for (Attachments::const_iterator it = attachments.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	713 it != attachments.end(); ++it)
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	714 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	715 db_.AddAttachment(instance, *it);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	716 }
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	717
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	718 // Attach the user-specified metadata
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	719 for (MetadataMap::const_iterator
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	720 it = metadata.begin(); it != metadata.end(); ++it)
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	721 {
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	722 switch (it->first.first)
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	723 {
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	724 case ResourceType_Patient:
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	725 db_.SetMetadata(patient, it->first.second, it->second);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	726 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	727
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	728 case ResourceType_Study:
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	729 db_.SetMetadata(study, it->first.second, it->second);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	730 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	731
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	732 case ResourceType_Series:
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	733 db_.SetMetadata(series, it->first.second, it->second);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	734 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	735
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	736 case ResourceType_Instance:
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	737 db_.SetMetadata(instance, it->first.second, it->second);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	738 instanceMetadata[it->first.second] = it->second;
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	739 break;
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	740
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	741 default:
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	742 throw OrthancException(ErrorCode_ParameterOutOfRange);
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	743 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	744 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	745
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	746 // Attach the auto-computed metadata for the patient/study/series levels
432 2b09d4ee86c6 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	747 std::string now = Toolbox::GetNowIsoString();
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	748 db_.SetMetadata(series, MetadataType_LastUpdate, now);
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	749 db_.SetMetadata(study, MetadataType_LastUpdate, now);
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	750 db_.SetMetadata(patient, MetadataType_LastUpdate, now);
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	751
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	752 // Attach the auto-computed metadata for the instance level,
a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	753 // reflecting these additions into the input metadata map
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	754 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	755 instanceMetadata[MetadataType_Instance_ReceptionDate] = now;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	756
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	757 db_.SetMetadata(instance, MetadataType_Instance_RemoteAet, remoteAet);
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	758 instanceMetadata[MetadataType_Instance_RemoteAet] = remoteAet;
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	759
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	760 const DicomValue* value;
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	761 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL \|\|
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	762 (value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	763 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	764 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	765 instanceMetadata[MetadataType_Instance_IndexInSeries] = value->AsString();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	766 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	767
1004 a226e0959d8b DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 1002 diff changeset	768 // Check whether the series of this new instance is now completed
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	769 if (isNewSeries)
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	770 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	771 ComputeExpectedNumberOfInstances(db_, series, dicomSummary);
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	772 }
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	773
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	774 SeriesStatus seriesStatus = GetSeriesStatus(series);
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	775 if (seriesStatus == SeriesStatus_Complete)
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	776 {
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	777 LogChange(series, ChangeType_CompletedSeries, ResourceType_Series, hasher.HashSeries());
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	778 }
6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	779
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	780 // 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	781 MarkAsUnstable(series, ResourceType_Series, hasher.HashSeries());
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	782 MarkAsUnstable(study, ResourceType_Study, hasher.HashStudy());
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	783 MarkAsUnstable(patient, ResourceType_Patient, hasher.HashPatient());
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	784
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	785 t.Commit(instanceSize);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	786
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	787 return StoreStatus_Success;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	788 }
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	789 catch (OrthancException& e)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	790 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	791 LOG(ERROR) << "EXCEPTION [" << e.What() << "]";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	792 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	794 return StoreStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	798 void ServerIndex::ComputeStatistics(Json::Value& target)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	800 boost::mutex::scoped_lock lock(mutex_);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	801 target = Json::objectValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	803 uint64_t cs = currentStorageSize_;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	804 assert(cs == db_.GetTotalCompressedSize());
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	805 uint64_t us = db_.GetTotalUncompressedSize();
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	806 target["TotalDiskSize"] = boost::lexical_cast<std::string>(cs);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	807 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	808 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	809 target["TotalUncompressedSizeMB"] = boost::lexical_cast<unsigned int>(us / MEGA_BYTES);
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	810
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	811 target["CountPatients"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Patient));
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	812 target["CountStudies"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Study));
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	813 target["CountSeries"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Series));
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	814 target["CountInstances"] = static_cast<unsigned int>(db_.GetResourceCount(ResourceType_Instance));
238 e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	815 }
e4148b0ab1d0 statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	816
187 8e673a65564d refactoring of storing new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	817
8e673a65564d refactoring of storing new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	818
585 b2357f1f026f fix types jodogne parents: 521 diff changeset	819 SeriesStatus ServerIndex::GetSeriesStatus(int64_t id)
199 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 // 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	822 int64_t expected;
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	823 if (!GetMetadataAsInteger(expected, id, MetadataType_Series_ExpectedNumberOfInstances))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	824 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	825 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	826 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	827
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	828 // Loop over the instances of this series
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	829 std::list<int64_t> children;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	830 db_.GetChildrenInternalId(children, id);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	831
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	832 std::set<int64_t> instances;
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	833 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	834 it = children.begin(); it != children.end(); ++it)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	835 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	836 // Get the index of this instance in the series
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	837 int64_t index;
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	838 if (!GetMetadataAsInteger(index, *it, MetadataType_Instance_IndexInSeries))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	839 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	840 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	841 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	842
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	843 if (!(index > 0 && index <= expected))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	844 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	845 // Out-of-range instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	846 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	847 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	848
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	849 if (instances.find(index) != instances.end())
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	850 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	851 // Twice the same instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	852 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	853 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	854
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	855 instances.insert(index);
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	856 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	857
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	858 if (static_cast<int64_t>(instances.size()) == expected)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	859 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	860 return SeriesStatus_Complete;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	861 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	862 else
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	863 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	864 return SeriesStatus_Missing;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	865 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	866 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	867
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	868
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	869
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	870 void ServerIndex::MainDicomTagsToJson(Json::Value& target,
1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	871 int64_t resourceId)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	872 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	873 DicomMap tags;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	874 db_.GetMainDicomTags(tags, resourceId);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	875 target["MainDicomTags"] = Json::objectValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	876 FromDcmtkBridge::ToJson(target["MainDicomTags"], tags);
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 bool ServerIndex::LookupResource(Json::Value& result,
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	880 const std::string& publicId,
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	881 ResourceType expectedType)
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 result = Json::objectValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	884
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	885 boost::mutex::scoped_lock lock(mutex_);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	886
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	887 // Lookup for the requested resource
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	888 int64_t id;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	889 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	890 if (!db_.LookupResource(id, type, publicId) \|\|
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	891 type != expectedType)
198 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 return false;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	894 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	895
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	896 // Find the parent resource (if it exists)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	897 if (type != ResourceType_Patient)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	898 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	899 int64_t parentId;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	900 if (!db_.LookupParent(parentId, id))
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	901 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	902 throw OrthancException(ErrorCode_InternalError);
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	903 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	904
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	905 std::string parent = db_.GetPublicId(parentId);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	906
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	907 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	908 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	909 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	910 result["ParentPatient"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	911 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	912
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	913 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	914 result["ParentStudy"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	915 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	916
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	917 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	918 result["ParentSeries"] = parent;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	919 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	920
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	921 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	922 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	923 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	924 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	925
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	926 // List the children resources
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	927 std::list<std::string> children;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	928 db_.GetChildrenPublicId(children, id);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	929
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	930 if (type != ResourceType_Instance)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	931 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	932 Json::Value c = Json::arrayValue;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	933
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	934 for (std::list<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	935 it = children.begin(); it != children.end(); ++it)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	936 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	937 c.append(*it);
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	938 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	939
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	940 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	941 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	942 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	943 result["Studies"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	944 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	945
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	946 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	947 result["Series"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	948 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	949
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	950 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	951 result["Instances"] = c;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	952 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	953
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	954 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	955 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	956 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	957 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	958
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	959 // Set the resource type
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	960 switch (type)
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	961 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	962 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	963 result["Type"] = "Patient";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	964 break;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	965
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	966 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	967 result["Type"] = "Study";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	968 break;
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	969
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	970 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	971 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	972 result["Type"] = "Series";
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	973 result["Status"] = EnumerationToString(GetSeriesStatus(id));
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	974
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	975 int64_t i;
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	976 if (GetMetadataAsInteger(i, id, MetadataType_Series_ExpectedNumberOfInstances))
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	977 result["ExpectedNumberOfInstances"] = static_cast<int>(i);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	978 else
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	979 result["ExpectedNumberOfInstances"] = Json::nullValue;
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	980
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	981 break;
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	982 }
9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	983
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	984 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	985 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	986 result["Type"] = "Instance";
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	987
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	988 FileInfo attachment;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	989 if (!db_.LookupAttachment(attachment, id, FileContentType_Dicom))
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	990 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	991 throw OrthancException(ErrorCode_InternalError);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	992 }
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	993
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	994 result["FileSize"] = static_cast<unsigned int>(attachment.GetUncompressedSize());
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	995 result["FileUuid"] = attachment.GetUuid();
200 9c58b2b03cf0 refactoring of read operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	996
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	997 int64_t i;
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	998 if (GetMetadataAsInteger(i, id, MetadataType_Instance_IndexInSeries))
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	999 result["IndexInSeries"] = static_cast<int>(i);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1000 else
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1001 result["IndexInSeries"] = Json::nullValue;
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1002
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1003 break;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1004 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1005
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1006 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1007 throw OrthancException(ErrorCode_InternalError);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1008 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1009
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1010 // Record the remaining information
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1011 result["ID"] = publicId;
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	1012 MainDicomTagsToJson(result, id);
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1013
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1014 std::string tmp;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1015
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1016 if (db_.LookupMetadata(tmp, id, MetadataType_AnonymizedFrom))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1017 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1018 result["AnonymizedFrom"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1019 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1020
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1021 if (db_.LookupMetadata(tmp, id, MetadataType_ModifiedFrom))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1022 {
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1023 result["ModifiedFrom"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1024 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1025
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1026 if (type == ResourceType_Patient \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1027 type == ResourceType_Study \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1028 type == ResourceType_Series)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1029 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1030 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	1031
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1032 if (db_.LookupMetadata(tmp, id, MetadataType_LastUpdate))
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1033 {
1148 ac36589f699e LastUpdate metadata is now always returned for patients, studies and series Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	1034 result["LastUpdate"] = tmp;
1236 21d84e3acc0d clean Sebastien Jodogne <s.jodogne@gmail.com> parents: 1235 diff changeset	1035 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1036 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1037
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1038 return true;
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1039 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1040
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1041
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1042 bool ServerIndex::LookupAttachment(FileInfo& attachment,
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1043 const std::string& instanceUuid,
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	1044 FileContentType contentType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1045 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	1046 boost::mutex::scoped_lock lock(mutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1047
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1048 int64_t id;
a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1049 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1050 if (!db_.LookupResource(id, type, instanceUuid))
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1051 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 diff changeset	1052 throw OrthancException(ErrorCode_UnknownResource);
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1053 }
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	1054
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1055 if (db_.LookupAttachment(attachment, id, contentType))
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1056 {
233 c11273198cef rename Sebastien Jodogne <s.jodogne@gmail.com> parents: 232 diff changeset	1057 assert(attachment.GetContentType() == contentType);
232 5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1058 return true;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1059 }
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1060 else
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1061 {
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1062 return false;
5368bbe813cf refactoring of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	1063 }
192 c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1064 }
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1065
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1066
c56dc32266e0 refactoring getfile Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	1067
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1068 void ServerIndex::GetAllUuids(Json::Value& target,
190 b6cef9d45cc3 getallpublicids Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1069 ResourceType resourceType)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1070 {
1241 90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1071 std::list<std::string> lst;
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1072
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1073 {
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1074 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1075 db_.GetAllPublicIds(lst, resourceType);
1241 90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1076 }
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1077
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1078 target = Json::arrayValue;
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1079 for (std::list<std::string>::const_iterator
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1080 it = lst.begin(); it != lst.end(); it++)
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1081 {
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1082 target.append(*it);
90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	1083 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1085
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1087 template <typename T>
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1088 static void FormatLog(Json::Value& target,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1089 const std::list<T>& log,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1090 const std::string& name,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1091 bool done,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1092 int64_t since)
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1093 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1094 Json::Value items = Json::arrayValue;
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1095 for (typename std::list<T>::const_iterator
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1096 it = log.begin(); it != log.end(); it++)
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1097 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1098 Json::Value item;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1099 it->Format(item);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1100 items.append(item);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1101 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1102
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1103 target = Json::objectValue;
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1104 target[name] = items;
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1105 target["Done"] = done;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1106
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1107 int64_t last = (log.size() == 0 ? since : log.back().GetSeq());
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1108 target["Last"] = static_cast<int>(last);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1109 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1110
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1111
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1112 void ServerIndex::GetChanges(Json::Value& target,
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	1113 int64_t since,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1114 unsigned int maxResults)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1115 {
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1116 std::list<ServerIndexChange> changes;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1117 bool done;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1118
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1119 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1120 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1121 db_.GetChanges(changes, done, since, maxResults);
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1122 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1123
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1124 FormatLog(target, changes, "Changes", done, since);
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1125 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1126
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1127
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1128 void ServerIndex::GetLastChange(Json::Value& target)
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1129 {
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1130 std::list<ServerIndexChange> changes;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1131
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1132 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1133 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1134 db_.GetLastChange(changes);
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1135 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1136
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1137 FormatLog(target, changes, "Changes", true, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1138 }
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1139
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1140
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1141 void ServerIndex::LogExportedResource(const std::string& publicId,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1142 const std::string& remoteModality)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1143 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1144 boost::mutex::scoped_lock lock(mutex_);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1145
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1146 int64_t id;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1147 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1148 if (!db_.LookupResource(id, type, publicId))
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1149 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1150 throw OrthancException(ErrorCode_InternalError);
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1151 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1152
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1153 std::string patientId;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1154 std::string studyInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1155 std::string seriesInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1156 std::string sopInstanceUid;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1157
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1158 int64_t currentId = id;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1159 ResourceType currentType = type;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1160
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1161 // Iteratively go up inside the patient/study/series/instance hierarchy
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1162 bool done = false;
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1163 while (!done)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1164 {
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1165 DicomMap map;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1166 db_.GetMainDicomTags(map, currentId);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1167
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1168 switch (currentType)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1169 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1170 case ResourceType_Patient:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1171 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1172 done = true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1173 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1174
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1175 case ResourceType_Study:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1176 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1177 currentType = ResourceType_Patient;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1178 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1179
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1180 case ResourceType_Series:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1181 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1182 currentType = ResourceType_Study;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1183 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1184
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1185 case ResourceType_Instance:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1186 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).AsString();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1187 currentType = ResourceType_Series;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1188 break;
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1189
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1190 default:
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1191 throw OrthancException(ErrorCode_InternalError);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1192 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1193
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1194 // 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	1195 // the current resource
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1196 if (!done)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1197 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1198 bool ok = db_.LookupParent(currentId, currentId);
375 d1ea72f1c967 major fix of storescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	1199 assert(ok);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1200 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1201 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1202
1235 9b4977e3c19d abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	1203 // No need for a SQLite::ITransaction here, as we only insert 1 record
1246 54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1204 ExportedResource resource(-1,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1205 type,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1206 publicId,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1207 remoteModality,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1208 Toolbox::GetNowIsoString(),
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1209 patientId,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1210 studyInstanceUid,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1211 seriesInstanceUid,
54bf0f0245f4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1244 diff changeset	1212 sopInstanceUid);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1213 db_.LogExportedResource(resource);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1214 }
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1215
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1216
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1217 void ServerIndex::GetExportedResources(Json::Value& target,
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1218 int64_t since,
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1219 unsigned int maxResults)
8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1220 {
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1221 std::list<ExportedResource> exported;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1222 bool done;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1223
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1224 {
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1225 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1226 db_.GetExportedResources(exported, done, since, maxResults);
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1227 }
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1228
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1229 FormatLog(target, exported, "Exports", done, since);
231 8098448bd827 export log Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	1230 }
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1231
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1232
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1233 void ServerIndex::GetLastExportedResource(Json::Value& target)
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1234 {
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1235 std::list<ExportedResource> exported;
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1236
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1237 {
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1238 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1239 db_.GetLastExportedResource(exported);
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1240 }
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1241
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1242 FormatLog(target, exported, "Exports", true, 0);
237 16a4ac70bd8a last change and export Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	1243 }
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1244
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1245
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1246 bool ServerIndex::IsRecyclingNeeded(uint64_t instanceSize)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1247 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1248 if (maximumStorageSize_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1249 {
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1250 uint64_t currentSize = currentStorageSize_ - listener_->GetSizeOfFilesToRemove();
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1251 assert(db_.GetTotalCompressedSize() == currentSize);
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1252
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1253 if (currentSize + instanceSize > maximumStorageSize_)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1254 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1255 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1256 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1257 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1258
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1259 if (maximumPatients_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1260 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1261 uint64_t patientCount = db_.GetResourceCount(ResourceType_Patient);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1262 if (patientCount > maximumPatients_)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1263 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1264 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1265 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1266 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1267
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1268 return false;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1269 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1270
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1271
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1272 void ServerIndex::Recycle(uint64_t instanceSize,
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1273 const std::string& newPatientId)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1274 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1275 if (!IsRecyclingNeeded(instanceSize))
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1276 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1277 return;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1278 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1279
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1280 // Check whether other DICOM instances from this patient are
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1281 // already stored
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1282 int64_t patientToAvoid;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1283 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1284 bool hasPatientToAvoid = db_.LookupResource(patientToAvoid, type, newPatientId);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1285
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1286 if (hasPatientToAvoid && type != ResourceType_Patient)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1287 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1288 throw OrthancException(ErrorCode_InternalError);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1289 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1290
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1291 // Iteratively select patient to remove until there is enough
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1292 // space in the DICOM store
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1293 int64_t patientToRecycle;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1294 while (true)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1295 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1296 // 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	1297 // we must avoid to recycle them
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1298 bool ok = hasPatientToAvoid ?
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1299 db_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1300 db_.SelectPatientToRecycle(patientToRecycle);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1301
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1302 if (!ok)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1303 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1304 throw OrthancException(ErrorCode_FullStorage);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1305 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1306
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1307 LOG(INFO) << "Recycling one patient";
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1308 db_.DeleteResource(patientToRecycle);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1309
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1310 if (!IsRecyclingNeeded(instanceSize))
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1311 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1312 // OK, we're done
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1313 break;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1314 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1315 }
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1316 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1317
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1318 void ServerIndex::SetMaximumPatientCount(unsigned int count)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1319 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1320 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1321 maximumPatients_ = count;
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1322
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1323 if (count == 0)
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1324 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1325 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	1326 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1327 else
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1328 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1329 LOG(WARNING) << "At most " << count << " patients will be stored";
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1330 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1331
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1332 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1333 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1334
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1335 void ServerIndex::SetMaximumStorageSize(uint64_t size)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1336 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1337 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1338 maximumStorageSize_ = size;
270 e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1339
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1340 if (size == 0)
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1341 {
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1342 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	1343 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1344 else
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1345 {
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1346 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	1347 }
e6a4c4329481 parameters for storage capacity Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	1348
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1349 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1350 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1351
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1352 void ServerIndex::StandaloneRecycling()
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1353 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1354 // 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	1355 Transaction t(*this);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1356 Recycle(0, "");
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1357 t.Commit(0);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1358 }
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1359
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1360
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1361 bool ServerIndex::IsProtectedPatient(const std::string& publicId)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1362 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1363 boost::mutex::scoped_lock lock(mutex_);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1364
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1365 // Lookup for the requested resource
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1366 int64_t id;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1367 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1368 if (!db_.LookupResource(id, type, publicId) \|\|
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1369 type != ResourceType_Patient)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1370 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1371 throw OrthancException(ErrorCode_ParameterOutOfRange);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1372 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1373
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1374 return db_.IsProtectedPatient(id);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1375 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1376
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1377
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1378 void ServerIndex::SetProtectedPatient(const std::string& publicId,
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1379 bool isProtected)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1380 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1381 boost::mutex::scoped_lock lock(mutex_);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1382
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1383 // Lookup for the requested resource
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1384 int64_t id;
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1385 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1386 if (!db_.LookupResource(id, type, publicId) \|\|
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1387 type != ResourceType_Patient)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1388 {
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1389 throw OrthancException(ErrorCode_ParameterOutOfRange);
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1390 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1391
1235 9b4977e3c19d abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	1392 // No need for a SQLite::ITransaction here, as we only make 1 write to the DB
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1393 db_.SetProtectedPatient(id, isProtected);
272 337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1394
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1395 if (isProtected)
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1396 LOG(INFO) << "Patient " << publicId << " has been protected";
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1397 else
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1398 LOG(INFO) << "Patient " << publicId << " has been unprotected";
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1399 }
337c506461d2 protection from rest api Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1400
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1401
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1402 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	1403 const std::string& publicId)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1404 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1405 result.clear();
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1406
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1407 boost::mutex::scoped_lock lock(mutex_);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1408
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1409 ResourceType type;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1410 int64_t resource;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1411 if (!db_.LookupResource(resource, type, publicId))
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1412 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1413 throw OrthancException(ErrorCode_UnknownResource);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1414 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1415
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1416 if (type == ResourceType_Instance)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1417 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1418 // An instance cannot have a child
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1419 throw OrthancException(ErrorCode_BadParameterType);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1420 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1421
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1422 std::list<int64_t> tmp;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1423 db_.GetChildrenInternalId(tmp, resource);
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1424
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1425 for (std::list<int64_t>::const_iterator
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1426 it = tmp.begin(); it != tmp.end(); ++it)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1427 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1428 result.push_back(db_.GetPublicId(*it));
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1429 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1430 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1431
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 704 diff changeset	1432
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1433 void ServerIndex::GetChildInstances(std::list<std::string>& result,
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1434 const std::string& publicId)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1435 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1436 result.clear();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1437
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1438 boost::mutex::scoped_lock lock(mutex_);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1439
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1440 ResourceType type;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1441 int64_t top;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1442 if (!db_.LookupResource(top, type, publicId))
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1443 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1444 throw OrthancException(ErrorCode_UnknownResource);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1445 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1446
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1447 if (type == ResourceType_Instance)
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1448 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1449 // The resource is already an instance: Do not go down the hierarchy
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1450 result.push_back(publicId);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1451 return;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1452 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1453
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1454 std::stack<int64_t> toExplore;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1455 toExplore.push(top);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1456
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1457 std::list<int64_t> tmp;
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1458
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1459 while (!toExplore.empty())
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1460 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1461 // Get the internal ID of the current resource
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1462 int64_t resource = toExplore.top();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1463 toExplore.pop();
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1464
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1465 if (db_.GetResourceType(resource) == ResourceType_Instance)
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1466 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1467 result.push_back(db_.GetPublicId(resource));
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1468 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1469 else
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1470 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1471 // Tag all the children of this resource as to be explored
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1472 db_.GetChildrenInternalId(tmp, resource);
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1473 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1474 it = tmp.begin(); it != tmp.end(); ++it)
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1475 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1476 toExplore.push(*it);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1477 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1478 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1479 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1480 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1481
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1482
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1483 void ServerIndex::SetMetadata(const std::string& publicId,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1484 MetadataType type,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1485 const std::string& value)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1486 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1487 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1488
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1489 ResourceType rtype;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1490 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1491 if (!db_.LookupResource(id, rtype, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1492 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1493 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1494 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1495
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1496 db_.SetMetadata(id, type, value);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1497 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1498
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1499
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1500 void ServerIndex::DeleteMetadata(const std::string& publicId,
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1501 MetadataType type)
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1502 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1503 boost::mutex::scoped_lock lock(mutex_);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1504
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1505 ResourceType rtype;
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1506 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1507 if (!db_.LookupResource(id, rtype, publicId))
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1508 {
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1509 throw OrthancException(ErrorCode_UnknownResource);
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1510 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1511
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1512 db_.DeleteMetadata(id, type);
438 7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1513 }
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1514
7bbe77cb9e12 DELETE metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	1515
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1516 bool ServerIndex::LookupMetadata(std::string& target,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1517 const std::string& publicId,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1518 MetadataType type)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1519 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1520 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1521
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1522 ResourceType rtype;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1523 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1524 if (!db_.LookupResource(id, rtype, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1525 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1526 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1527 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1528
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1529 return db_.LookupMetadata(target, id, type);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1530 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1531
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1532
739 696dbb4fd390 api uniformization Sebastien Jodogne <s.jodogne@gmail.com> parents: 714 diff changeset	1533 void ServerIndex::ListAvailableMetadata(std::list<MetadataType>& target,
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1534 const std::string& publicId)
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1535 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1536 boost::mutex::scoped_lock lock(mutex_);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1537
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1538 ResourceType rtype;
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1539 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1540 if (!db_.LookupResource(id, rtype, publicId))
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1541 {
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1542 throw OrthancException(ErrorCode_UnknownResource);
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1543 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1544
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1545 db_.ListAvailableMetadata(target, id);
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1546 }
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1547
d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	1548
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1549 void ServerIndex::ListAvailableAttachments(std::list<FileContentType>& target,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1550 const std::string& publicId,
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1551 ResourceType expectedType)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1552 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1553 boost::mutex::scoped_lock lock(mutex_);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1554
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1555 ResourceType type;
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1556 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1557 if (!db_.LookupResource(id, type, publicId) \|\|
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1558 expectedType != type)
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1559 {
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1560 throw OrthancException(ErrorCode_UnknownResource);
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1561 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1562
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1563 db_.ListAvailableAttachments(target, id);
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1564 }
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1565
dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	1566
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1567 bool ServerIndex::LookupParent(std::string& target,
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1568 const std::string& publicId)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1569 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1570 boost::mutex::scoped_lock lock(mutex_);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1571
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1572 ResourceType type;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1573 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1574 if (!db_.LookupResource(id, type, publicId))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1575 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1576 throw OrthancException(ErrorCode_UnknownResource);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1577 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1578
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1579 int64_t parentId;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1580 if (db_.LookupParent(parentId, id))
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1581 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1582 target = db_.GetPublicId(parentId);
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1583 return true;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1584 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1585 else
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1586 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1587 return false;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1588 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1589 }
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1590
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1591
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1592 uint64_t ServerIndex::IncrementGlobalSequence(GlobalProperty sequence)
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1593 {
6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1594 boost::mutex::scoped_lock lock(mutex_);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1595
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1596 std::auto_ptr<SQLite::ITransaction> transaction(db_.StartTransaction());
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1597
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1598 transaction->Begin();
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1599 uint64_t seq = IncrementGlobalSequenceInternal(sequence);
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1600 transaction->Commit();
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1601
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1602 return seq;
310 6ab6cdeedf4e global sequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	1603 }
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1604
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1605
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1606
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1607 void ServerIndex::LogChange(ChangeType changeType,
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1608 const std::string& publicId)
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1609 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1610 boost::mutex::scoped_lock lock(mutex_);
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1611 std::auto_ptr<SQLite::ITransaction> transaction(db_.StartTransaction());
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1612 transaction->Begin();
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1613
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1614 int64_t id;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1615 ResourceType type;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1616 if (!db_.LookupResource(id, type, publicId))
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1617 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1618 throw OrthancException(ErrorCode_UnknownResource);
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1619 }
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1620
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1621 LogChange(id, changeType, type, publicId);
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1622
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1623 transaction->Commit();
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	1624 }
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1625
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1626
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1627 void ServerIndex::DeleteChanges()
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1628 {
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1629 boost::mutex::scoped_lock lock(mutex_);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	1630 db_.ClearChanges();
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1631 }
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1632
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1633 void ServerIndex::DeleteExportedResources()
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1634 {
47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1635 boost::mutex::scoped_lock lock(mutex_);
1286 b4acdb37e43b refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1271 diff changeset	1636 db_.ClearExportedResources();
413 47d63c941902 clearing /exports and /changes Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1637 }
440 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
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1640 void ServerIndex::GetStatisticsInternal(/* out */ uint64_t& compressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1641 /* out */ uint64_t& uncompressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1642 /* out */ unsigned int& countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1643 /* out */ unsigned int& countSeries,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1644 /* out */ unsigned int& countInstances,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1645 /* in */ int64_t id,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1646 /* in */ ResourceType type)
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1647 {
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1648 std::stack<int64_t> toExplore;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1649 toExplore.push(id);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1650
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1651 countInstances = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1652 countSeries = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1653 countStudies = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1654 compressedSize = 0;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1655 uncompressedSize = 0;
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1656
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1657 while (!toExplore.empty())
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1658 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1659 // 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	1660 int64_t resource = toExplore.top();
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1661 toExplore.pop();
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1662
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1663 ResourceType thisType = db_.GetResourceType(resource);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1664
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1665 std::list<FileContentType> f;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1666 db_.ListAvailableAttachments(f, resource);
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1667
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1668 for (std::list<FileContentType>::const_iterator
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1669 it = f.begin(); it != f.end(); ++it)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1670 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1671 FileInfo attachment;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1672 if (db_.LookupAttachment(attachment, resource, *it))
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1673 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1674 compressedSize += attachment.GetCompressedSize();
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1675 uncompressedSize += attachment.GetUncompressedSize();
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1676 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1677 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1678
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1679 if (thisType == ResourceType_Instance)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1680 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1681 countInstances++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1682 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1683 else
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1684 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1685 switch (thisType)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1686 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1687 case ResourceType_Study:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1688 countStudies++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1689 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1690
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1691 case ResourceType_Series:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1692 countSeries++;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1693 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1694
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1695 default:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1696 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1697 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1698
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1699 // 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	1700 std::list<int64_t> tmp;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1701 db_.GetChildrenInternalId(tmp, resource);
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1702 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1703 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	1704 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1705 toExplore.push(*it);
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1706 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1707 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1708 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1709
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1710 if (countStudies == 0)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1711 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1712 countStudies = 1;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1713 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1714
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1715 if (countSeries == 0)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1716 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1717 countSeries = 1;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1718 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1719 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1720
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1721
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1722
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1723 void ServerIndex::GetStatistics(Json::Value& target,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1724 const std::string& publicId)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1725 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1726 boost::mutex::scoped_lock lock(mutex_);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1727
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1728 ResourceType type;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1729 int64_t top;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1730 if (!db_.LookupResource(top, type, publicId))
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1731 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1732 throw OrthancException(ErrorCode_UnknownResource);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1733 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1734
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1735 uint64_t uncompressedSize;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1736 uint64_t compressedSize;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1737 unsigned int countStudies;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1738 unsigned int countSeries;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1739 unsigned int countInstances;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1740 GetStatisticsInternal(compressedSize, uncompressedSize, countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1741 countSeries, countInstances, top, type);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1742
440 23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1743 target = Json::objectValue;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1744 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	1745 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	1746 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	1747 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	1748
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1749 switch (type)
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1750 {
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1751 // Do NOT add "break" below this point!
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1752 case ResourceType_Patient:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1753 target["CountStudies"] = countStudies;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1754
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1755 case ResourceType_Study:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1756 target["CountSeries"] = countSeries;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1757
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1758 case ResourceType_Series:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1759 target["CountInstances"] = countInstances;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1760
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1761 case ResourceType_Instance:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1762 default:
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1763 break;
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1764 }
23e5b35e3c5c statistics for patient/studies/series/instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 438 diff changeset	1765 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1766
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1767
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1768 void ServerIndex::GetStatistics(/* out */ uint64_t& compressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1769 /* out */ uint64_t& uncompressedSize,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1770 /* out */ unsigned int& countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1771 /* out */ unsigned int& countSeries,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1772 /* out */ unsigned int& countInstances,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1773 const std::string& publicId)
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1774 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1775 boost::mutex::scoped_lock lock(mutex_);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1776
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1777 ResourceType type;
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1778 int64_t top;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1779 if (!db_.LookupResource(top, type, publicId))
646 fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1780 {
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1781 throw OrthancException(ErrorCode_UnknownResource);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1782 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1783
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1784 GetStatisticsInternal(compressedSize, uncompressedSize, countStudies,
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1785 countSeries, countInstances, top, type);
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1786 }
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1787
fb49bf72ac2d fix issue 7 Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	1788
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1789 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1790 {
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 744 diff changeset	1791 int stableAge = Configuration::GetGlobalIntegerParameter("StableAge", 60);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1792 if (stableAge <= 0)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1793 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1794 stableAge = 60;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1795 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1796
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1797 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	1798
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1799 while (!that->done_)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1800 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1801 // Check for stable resources each second
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1802 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	1803
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1804 boost::mutex::scoped_lock lock(that->mutex_);
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1805
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1806 while (!that->unstableResources_.IsEmpty() &&
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1807 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	1808 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1809 // 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	1810 // 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	1811
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1812 UnstableResourcePayload payload;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1813 int64_t id = that->unstableResources_.RemoveOldest(payload);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1814
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1815 // Ensure that the resource is still existing before logging the change
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1816 if (that->db_.IsExistingResource(id))
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1817 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1818 switch (payload.GetResourceType())
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1819 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1820 case ResourceType_Patient:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1821 that->LogChange(id, ChangeType_StablePatient, ResourceType_Patient, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1822 break;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1823
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1824 case ResourceType_Study:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1825 that->LogChange(id, ChangeType_StableStudy, ResourceType_Study, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1826 break;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1827
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1828 case ResourceType_Series:
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1829 that->LogChange(id, ChangeType_StableSeries, ResourceType_Series, payload.GetPublicId());
513 935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1830 break;
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1831
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1832 default:
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1833 throw OrthancException(ErrorCode_InternalError);
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1834 }
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1835
935e8c7e0b18 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 511 diff changeset	1836 //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	1837 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1838 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1839 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1840
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1841 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	1842 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1843
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1844
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1845 void ServerIndex::MarkAsUnstable(int64_t id,
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1846 Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1847 const std::string& publicId)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1848 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1849 // 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	1850
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1851 assert(type == Orthanc::ResourceType_Patient \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1852 type == Orthanc::ResourceType_Study \|\|
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1853 type == Orthanc::ResourceType_Series);
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1854
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1855 UnstableResourcePayload payload(type, publicId);
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	1856 unstableResources_.AddOrMakeMostRecent(id, payload);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1857 //LOG(INFO) << "Unstable resource: " << EnumerationToString(type) << " " << id;
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	1858
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	1859 LogChange(id, ChangeType_NewChildInstance, type, publicId);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	1860 }
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1861
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1862
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1863
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1864 void ServerIndex::LookupIdentifier(std::list<std::string>& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1865 const DicomTag& tag,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1866 const std::string& value,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1867 ResourceType type)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1868 {
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1869 result.clear();
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1870
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1871 boost::mutex::scoped_lock lock(mutex_);
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1872
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1873 std::list<int64_t> id;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1874 db_.LookupIdentifier(id, tag, value);
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1875
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1876 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1877 it = id.begin(); it != id.end(); ++it)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1878 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1879 if (db_.GetResourceType(*it) == type)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1880 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1881 result.push_back(db_.GetPublicId(*it));
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1882 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1883 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1884 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1885
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 585 diff changeset	1886
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1887 void ServerIndex::LookupIdentifier(std::list<std::string>& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1888 const DicomTag& tag,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1889 const std::string& value)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1890 {
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1891 result.clear();
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1892
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1893 boost::mutex::scoped_lock lock(mutex_);
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1894
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1895 std::list<int64_t> id;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1896 db_.LookupIdentifier(id, tag, value);
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1897
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1898 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1899 it = id.begin(); it != id.end(); ++it)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1900 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1901 result.push_back(db_.GetPublicId(*it));
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1902 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1903 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1904
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1905
1162 1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1906 void ServerIndex::LookupIdentifier(std::list< std::pair<ResourceType, std::string> >& result,
1ea4094d077c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1158 diff changeset	1907 const std::string& value)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1908 {
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1909 result.clear();
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1910
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1911 boost::mutex::scoped_lock lock(mutex_);
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1912
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1913 std::list<int64_t> id;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1914 db_.LookupIdentifier(id, value);
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1915
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1916 for (std::list<int64_t>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	1917 it = id.begin(); it != id.end(); ++it)
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1918 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1919 result.push_back(std::make_pair(db_.GetResourceType(*it),
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1920 db_.GetPublicId(*it)));
521 2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1921 }
2c739f76d0bb lookup tag values Sebastien Jodogne <s.jodogne@gmail.com> parents: 513 diff changeset	1922 }
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1923
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1924
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1925 StoreStatus ServerIndex::AddAttachment(const FileInfo& attachment,
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1926 const std::string& publicId)
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1927 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1928 boost::mutex::scoped_lock lock(mutex_);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1929
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1930 Transaction t(*this);
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1931
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1932 ResourceType resourceType;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1933 int64_t resourceId;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1934 if (!db_.LookupResource(resourceId, resourceType, publicId))
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1935 {
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1936 return StoreStatus_Failure; // Inexistent resource
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1937 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1938
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1939 // Remove possible previous attachment
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1940 db_.DeleteAttachment(resourceId, attachment.GetContentType());
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1941
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1942 // Locate the patient of the target resource
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1943 int64_t patientId = resourceId;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1944 for (;;)
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1945 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1946 int64_t parent;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1947 if (db_.LookupParent(parent, patientId))
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1948 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1949 // We have not reached the patient level yet
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1950 patientId = parent;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1951 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1952 else
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1953 {
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1954 // We have reached the patient level
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1955 break;
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1956 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1957 }
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1958
4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1959 // Possibly apply the recycling mechanism while preserving this patient
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1960 assert(db_.GetResourceType(patientId) == ResourceType_Patient);
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1961 Recycle(attachment.GetCompressedSize(), db_.GetPublicId(patientId));
704 4789da60d655 recycling with custom attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 702 diff changeset	1962
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1963 db_.AddAttachment(resourceId, attachment);
699 2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1964
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1965 t.Commit(attachment.GetCompressedSize());
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1966
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1967 return StoreStatus_Success;
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1968 }
2929e17f8447 add attachments to resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 697 diff changeset	1969
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1970
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1971 void ServerIndex::DeleteAttachment(const std::string& publicId,
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1972 FileContentType type)
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1973 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1974 boost::mutex::scoped_lock lock(mutex_);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1975
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1976 Transaction t(*this);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1977
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1978 ResourceType rtype;
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1979 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1980 if (!db_.LookupResource(id, rtype, publicId))
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1981 {
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1982 throw OrthancException(ErrorCode_UnknownResource);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1983 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1984
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1985 db_.DeleteAttachment(id, type);
702 7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1986
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1987 t.Commit(0);
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1988 }
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1989
7592a48e97e4 delete custom attachment Sebastien Jodogne <s.jodogne@gmail.com> parents: 701 diff changeset	1990
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1991 bool ServerIndex::GetMetadata(Json::Value& target,
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1992 const std::string& publicId)
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1993 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1994 boost::mutex::scoped_lock lock(mutex_);
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1995
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1996 target = Json::objectValue;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1997
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1998 ResourceType type;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1999 int64_t id;
1294 910478b2d4e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	2000 if (!db_.LookupResource(id, type, publicId))
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2001 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2002 return false;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2003 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2004
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2005 std::list<MetadataType> metadata;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2006 db_.ListAvailableMetadata(metadata, id);
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2007
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2008 for (std::list<MetadataType>::const_iterator
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2009 it = metadata.begin(); it != metadata.end(); it++)
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2010 {
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2011 std::string key = EnumerationToString(*it);
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2012
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2013 std::string value;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2014 if (!db_.LookupMetadata(value, id, *it))
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2015 {
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2016 value.clear();
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2017 }
6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	2018
1002 b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2019 target[key] = value;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2020 }
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2021
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2022 return true;
b067017a8a5b anonymization refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	2023 }
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2024
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2025
1249 40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2026 void ServerIndex::SetGlobalProperty(GlobalProperty property,
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2027 const std::string& value)
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2028 {
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2029 boost::mutex::scoped_lock lock(mutex_);
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2030 db_.SetGlobalProperty(property, value);
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2031 }
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2032
40725595aaf0 Plugins can get/set global properties to save their configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 1247 diff changeset	2033
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2034 std::string ServerIndex::GetGlobalProperty(GlobalProperty property,
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2035 const std::string& defaultValue)
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2036 {
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2037 boost::mutex::scoped_lock lock(mutex_);
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2038
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2039 std::string value;
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	2040 if (db_.LookupGlobalProperty(value, property))
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2041 {
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2042 return value;
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2043 }
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2044 else
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2045 {
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2046 return defaultValue;
92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	2047 }
1218 efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2048 }
efece308018e report database version in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 1198 diff changeset	2049
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2050 }

Mercurial > hg > orthanc

annotate OrthancServer/ServerIndex.cpp @ 1300:919dfb2fb3fe