comparison OrthancServer/ServerIndex.h @ 179:78e28d0098d9

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 09 Nov 2012 11:30:16 +0100
parents fe180eae201d
children 626777d01dc4
comparison
equal deleted inserted replaced
178:5739b4d10a4b 179:78e28d0098d9
34 34
35 #include <boost/thread.hpp> 35 #include <boost/thread.hpp>
36 #include "../Core/SQLite/Connection.h" 36 #include "../Core/SQLite/Connection.h"
37 #include "../Core/DicomFormat/DicomMap.h" 37 #include "../Core/DicomFormat/DicomMap.h"
38 #include "../Core/FileStorage.h" 38 #include "../Core/FileStorage.h"
39 #include "../Core/DicomFormat/DicomInstanceHasher.h"
39 40
40 41
41 namespace Orthanc 42 namespace Orthanc
42 { 43 {
43 enum SeriesStatus 44 enum SeriesStatus
92 bool GetMainDicomIntTag(int& result, 93 bool GetMainDicomIntTag(int& result,
93 const std::string& uuid, 94 const std::string& uuid,
94 const DicomTag& tag); 95 const DicomTag& tag);
95 96
96 bool HasInstance(std::string& instanceUuid, 97 bool HasInstance(std::string& instanceUuid,
97 const std::string& dicomInstance); 98 const DicomInstanceHasher& hasher);
98 99
99 void RecordChange(const std::string& resourceType, 100 void RecordChange(const std::string& resourceType,
100 const std::string& uuid); 101 const std::string& uuid);
101 102
102 std::string CreateInstance(const std::string& parentSeriesUuid, 103 std::string CreateInstance(const std::string& parentSeriesUuid,
103 const std::string& dicomInstance, 104 const DicomInstanceHasher& hasher,
104 const DicomMap& dicomSummary, 105 const DicomMap& dicomSummary,
105 const std::string& fileUuid, 106 const std::string& fileUuid,
106 uint64_t fileSize, 107 uint64_t fileSize,
107 const std::string& jsonUuid, 108 const std::string& jsonUuid,
108 const std::string& distantAet); 109 const std::string& distantAet);
109 110
110 void RemoveInstance(const std::string& uuid); 111 void RemoveInstance(const std::string& uuid);
111 112
112 bool HasSeries(std::string& seriesUuid, 113 bool HasSeries(std::string& seriesUuid,
113 const std::string& dicomSeries); 114 const DicomInstanceHasher& hasher);
114 115
115 std::string CreateSeries(const std::string& parentStudyUuid, 116 std::string CreateSeries(const std::string& parentStudyUuid,
116 const std::string& dicomSeries, 117 const DicomInstanceHasher& hasher,
117 const DicomMap& dicomSummary); 118 const DicomMap& dicomSummary);
118 119
119 bool HasStudy(std::string& studyUuid, 120 bool HasStudy(std::string& studyUuid,
120 const std::string& dicomStudy); 121 const DicomInstanceHasher& hasher);
121 122
122 std::string CreateStudy(const std::string& parentPatientUuid, 123 std::string CreateStudy(const std::string& parentPatientUuid,
123 const std::string& dicomStudy, 124 const DicomInstanceHasher& hasher,
124 const DicomMap& dicomSummary); 125 const DicomMap& dicomSummary);
125 126
126 bool HasPatient(std::string& patientUuid, 127 bool HasPatient(std::string& patientUuid,
127 const std::string& dicomPatientId); 128 const DicomInstanceHasher& hasher);
128 129
129 std::string CreatePatient(const std::string& patientId, 130 std::string CreatePatient(const DicomInstanceHasher& hasher,
130 const DicomMap& dicomSummary); 131 const DicomMap& dicomSummary);
131 132
132 void GetMainDicomTags(DicomMap& map, 133 void GetMainDicomTags(DicomMap& map,
133 const std::string& uuid); 134 const std::string& uuid);
134 135