Mercurial > hg > orthanc

comparison OrthancServer/ServerIndex.cpp @ 1331:77e129ba64e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent freeze on C-FIND if no DICOM tag is to be returned
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 12 Mar 2015 10:47:32 +0100
parents 61ce8147f30d
children 382439943749
comparison
equal deleted inserted replaced
1330:7227b096a6dc 1331:77e129ba64e4
146 } 146 }
147 147
148 virtual void SignalRemainingAncestor(ResourceType parentType, 148 virtual void SignalRemainingAncestor(ResourceType parentType,
149 const std::string& publicId) 149 const std::string& publicId)
150 { 150 {
151 LOG(INFO) << "Remaining ancestor \"" << publicId << "\" (" << parentType << ")"; 151 VLOG(1) << "Remaining ancestor \"" << publicId << "\" (" << parentType << ")";
152 152
153 if (hasRemainingLevel_) 153 if (hasRemainingLevel_)
154 { 154 {
155 if (parentType < remainingType_) 155 if (parentType < remainingType_)
156 { 156 {
173 sizeOfFilesToRemove_ += info.GetCompressedSize(); 173 sizeOfFilesToRemove_ += info.GetCompressedSize();
174 } 174 }
175 175
176 virtual void SignalChange(const ServerIndexChange& change) 176 virtual void SignalChange(const ServerIndexChange& change)
177 { 177 {
178 LOG(INFO) << "Change related to resource " << change.GetPublicId() << " of type " 178 VLOG(1) << "Change related to resource " << change.GetPublicId() << " of type "
179 << EnumerationToString(change.GetResourceType()) << ": " 179 << EnumerationToString(change.GetResourceType()) << ": "
180 << EnumerationToString(change.GetChangeType()); 180 << EnumerationToString(change.GetChangeType());
181 181
182 if (insideTransaction_) 182 if (insideTransaction_)
183 { 183 {
184 pendingChanges_.push_back(change); 184 pendingChanges_.push_back(change);
185 } 185 }
1314 if (!ok) 1314 if (!ok)
1315 { 1315 {
1316 throw OrthancException(ErrorCode_FullStorage); 1316 throw OrthancException(ErrorCode_FullStorage);
1317 } 1317 }
1318 1318
1319 LOG(INFO) << "Recycling one patient"; 1319 VLOG(1) << "Recycling one patient";
1320 db_.DeleteResource(patientToRecycle); 1320 db_.DeleteResource(patientToRecycle);
1321 1321
1322 if (!IsRecyclingNeeded(instanceSize)) 1322 if (!IsRecyclingNeeded(instanceSize))
1323 { 1323 {
1324 // OK, we're done 1324 // OK, we're done