Mercurial > hg > orthanc

comparison OrthancServer/StorageCommitmentReports.cpp @ 3742:e5713a9acebd storage-commitment

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 11 Mar 2020 14:35:32 +0100
parents bff4da769f6f
children
comparison
equal deleted inserted replaced
3741:21efa32c8a10 3742:e5713a9acebd
114 static const char* const FIELD_FAILURES = "Failures"; 114 static const char* const FIELD_FAILURES = "Failures";
115 115
116 116
117 json = Json::objectValue; 117 json = Json::objectValue;
118 json[FIELD_REMOTE_AET] = remoteAet_; 118 json[FIELD_REMOTE_AET] = remoteAet_;
119
120 bool pending;
119 121
120 switch (GetStatus()) 122 switch (GetStatus())
121 { 123 {
122 case Status_Pending: 124 case Status_Pending:
123 json[FIELD_STATUS] = "Pending"; 125 json[FIELD_STATUS] = "Pending";
126 pending = true;
124 break; 127 break;
125 128
126 case Status_Success: 129 case Status_Success:
127 json[FIELD_STATUS] = "Success"; 130 json[FIELD_STATUS] = "Success";
131 pending = false;
128 break; 132 break;
129 133
130 case Status_Failure: 134 case Status_Failure:
131 json[FIELD_STATUS] = "Failure"; 135 json[FIELD_STATUS] = "Failure";
136 pending = false;
132 break; 137 break;
133 138
134 default: 139 default:
135 throw OrthancException(ErrorCode_InternalError); 140 throw OrthancException(ErrorCode_InternalError);
136 } 141 }
137 142
138 { 143 if (!pending)
139 Json::Value success = Json::arrayValue; 144 {
140 for (std::list<Success>::const_iterator
141 it = success_.begin(); it != success_.end(); ++it)
142 { 145 {
143 Json::Value item = Json::objectValue; 146 Json::Value success = Json::arrayValue;
144 item[FIELD_SOP_CLASS_UID] = it->sopClassUid_; 147 for (std::list<Success>::const_iterator
145 item[FIELD_SOP_INSTANCE_UID] = it->sopInstanceUid_; 148 it = success_.begin(); it != success_.end(); ++it)
146 success.append(item); 149 {
150 Json::Value item = Json::objectValue;
151 item[FIELD_SOP_CLASS_UID] = it->sopClassUid_;
152 item[FIELD_SOP_INSTANCE_UID] = it->sopInstanceUid_;
153 success.append(item);
154 }
155
156 json[FIELD_SUCCESS] = success;
147 } 157 }
148 158
149 json[FIELD_SUCCESS] = success;
150 }
151
152 {
153 Json::Value failures = Json::arrayValue;
154 for (std::list<Failure>::const_iterator
155 it = failures_.begin(); it != failures_.end(); ++it)
156 { 159 {
157 Json::Value item = Json::objectValue; 160 Json::Value failures = Json::arrayValue;
158 item[FIELD_SOP_CLASS_UID] = it->sopClassUid_; 161 for (std::list<Failure>::const_iterator
159 item[FIELD_SOP_INSTANCE_UID] = it->sopInstanceUid_; 162 it = failures_.begin(); it != failures_.end(); ++it)
160 item[FIELD_FAILURE_REASON] = it->reason_; 163 {
161 item[FIELD_DESCRIPTION] = EnumerationToString(it->reason_); 164 Json::Value item = Json::objectValue;
162 failures.append(item); 165 item[FIELD_SOP_CLASS_UID] = it->sopClassUid_;
166 item[FIELD_SOP_INSTANCE_UID] = it->sopInstanceUid_;
167 item[FIELD_FAILURE_REASON] = it->reason_;
168 item[FIELD_DESCRIPTION] = EnumerationToString(it->reason_);
169 failures.append(item);
170 }
171
172 json[FIELD_FAILURES] = failures;
163 } 173 }
164
165 json[FIELD_FAILURES] = failures;
166 } 174 }
167 } 175 }
168 176
169 177
170 void StorageCommitmentReports::Report::GetSuccessSopInstanceUids( 178 void StorageCommitmentReports::Report::GetSuccessSopInstanceUids(