comparison OrthancServer/Sources/Database/FindResponse.h @ 5579:77570cce8855 find-refactoring

removed redundant FindResponse::resourceId_
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 27 Apr 2024 11:31:39 +0200
parents 5a13483d12c5
children df7324d6e728
comparison
equal deleted inserted replaced
5577:9e74e761b108 5579:77570cce8855
82 class Item : public boost::noncopyable 82 class Item : public boost::noncopyable
83 { 83 {
84 private: 84 private:
85 FindRequest::ResponseContent responseContent_; // what has been requested 85 FindRequest::ResponseContent responseContent_; // what has been requested
86 ResourceType level_; 86 ResourceType level_;
87 std::string resourceId_; 87 std::string parent_; // TODO-FIND: Remove this, as it is redundant with "identifiers_"
88 std::string parent_;
89 OrthancIdentifiers identifiers_; // TODO-FIND: not convenient to use here. A simple resourceId seems enough 88 OrthancIdentifiers identifiers_; // TODO-FIND: not convenient to use here. A simple resourceId seems enough
90 std::unique_ptr<DicomMap> dicomMap_; 89 std::unique_ptr<DicomMap> dicomMap_;
91 std::list<std::string> children_; 90 std::list<std::string> children_;
92 std::string childInstanceId_; 91 std::string childInstanceId_;
93 std::set<std::string> labels_; 92 std::set<std::string> labels_;
104 { 103 {
105 } 104 }
106 105
107 Item(FindRequest::ResponseContent responseContent, 106 Item(FindRequest::ResponseContent responseContent,
108 ResourceType level, 107 ResourceType level,
109 const std::string& resourceId) :
110 responseContent_(responseContent),
111 level_(level),
112 resourceId_(resourceId)
113 {
114 }
115
116 Item(FindRequest::ResponseContent responseContent,
117 ResourceType level,
118 DicomMap* dicomMap /* takes ownership */); 108 DicomMap* dicomMap /* takes ownership */);
119 109
120 ResourceType GetLevel() const 110 ResourceType GetLevel() const
121 { 111 {
122 return level_; 112 return level_;
123 }
124
125 const std::string& GetResourceId() const
126 {
127 return resourceId_;
128 } 113 }
129 114
130 const OrthancIdentifiers& GetIdentifiers() const 115 const OrthancIdentifiers& GetIdentifiers() const
131 { 116 {
132 return identifiers_; 117 return identifiers_;