comparison OrthancServer/Sources/ResourceFinder.h @ 5709:476b1db52110 find-refactoring

removed the "format_" member from ResourceFinder
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Jul 2024 18:41:44 +0200
parents 1891a8c2dbb4
children d851a54e49b7
comparison
equal deleted inserted replaced
5708:1891a8c2dbb4 5709:476b1db52110
64 bool hasLimitsSince_; 64 bool hasLimitsSince_;
65 bool hasLimitsCount_; 65 bool hasLimitsCount_;
66 uint64_t limitsSince_; 66 uint64_t limitsSince_;
67 uint64_t limitsCount_; 67 uint64_t limitsCount_;
68 bool expand_; 68 bool expand_;
69 DicomToJsonFormat format_;
70 bool allowStorageAccess_; 69 bool allowStorageAccess_;
71 bool hasRequestedTags_; 70 bool hasRequestedTags_;
72 std::set<DicomTag> requestedPatientTags_; 71 std::set<DicomTag> requestedPatientTags_;
73 std::set<DicomTag> requestedStudyTags_; 72 std::set<DicomTag> requestedStudyTags_;
74 std::set<DicomTag> requestedSeriesTags_; 73 std::set<DicomTag> requestedSeriesTags_;
119 const std::string& id) 118 const std::string& id)
120 { 119 {
121 request_.SetOrthancId(level, id); 120 request_.SetOrthancId(level, id);
122 } 121 }
123 122
124 void SetFormat(DicomToJsonFormat format)
125 {
126 format_ = format;
127 }
128
129 void SetLimitsSince(uint64_t since); 123 void SetLimitsSince(uint64_t since);
130 124
131 void SetLimitsCount(uint64_t count); 125 void SetLimitsCount(uint64_t count);
132 126
133 void SetDatabaseLookup(const DatabaseLookup& lookup); 127 void SetDatabaseLookup(const DatabaseLookup& lookup);
171 request_.SetRetrieveAttachments(retrieve); 165 request_.SetRetrieveAttachments(retrieve);
172 } 166 }
173 167
174 void Expand(Json::Value& target, 168 void Expand(Json::Value& target,
175 const FindResponse::Resource& resource, 169 const FindResponse::Resource& resource,
176 ServerIndex& index) const; 170 ServerIndex& index,
171 DicomToJsonFormat format) const;
177 172
178 void Execute(FindResponse& target, 173 void Execute(FindResponse& target,
179 ServerIndex& index) const; 174 ServerIndex& index) const;
180 175
181 void Execute(IVisitor& visitor, 176 void Execute(IVisitor& visitor,
182 ServerContext& context) const; 177 ServerContext& context) const;
183 178
184 void Execute(Json::Value& target, 179 void Execute(Json::Value& target,
185 ServerContext& context) const; 180 ServerContext& context,
181 DicomToJsonFormat format) const;
186 182
187 bool ExecuteOneResource(Json::Value& target, 183 bool ExecuteOneResource(Json::Value& target,
188 ServerContext& context) const; 184 ServerContext& context,
185 DicomToJsonFormat format) const;
189 }; 186 };
190 } 187 }