Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerContext.cpp @ 4460:6831de40acd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New metadata automatically computed at the series level: "RemoteAET"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 20 Jan 2021 14:20:37 +0100
parents 789676a8c96a
children fe774d8e904b
comparison
equal deleted inserted replaced
4459:16392fe89ce0 4460:6831de40acd9
1439 } 1439 }
1440 1440
1441 1441
1442 bool ServerContext::LookupOrReconstructMetadata(std::string& target, 1442 bool ServerContext::LookupOrReconstructMetadata(std::string& target,
1443 const std::string& publicId, 1443 const std::string& publicId,
1444 ResourceType level,
1444 MetadataType metadata) 1445 MetadataType metadata)
1445 { 1446 {
1446 // This is a backwards-compatibility function, that can 1447 // This is a backwards-compatibility function, that can
1447 // reconstruct metadata that were not generated by an older 1448 // reconstruct metadata that were not generated by an older
1448 // release of Orthanc 1449 // release of Orthanc
1449 1450
1450 if (metadata == MetadataType_Instance_SopClassUid || 1451 if (metadata == MetadataType_Instance_SopClassUid ||
1451 metadata == MetadataType_Instance_TransferSyntax) 1452 metadata == MetadataType_Instance_TransferSyntax)
1452 { 1453 {
1453 if (index_.LookupMetadata(target, publicId, metadata)) 1454 if (index_.LookupMetadata(target, publicId, level, metadata))
1454 { 1455 {
1455 return true; 1456 return true;
1456 } 1457 }
1457 else 1458 else
1458 { 1459 {
1503 } 1504 }
1504 } 1505 }
1505 else 1506 else
1506 { 1507 {
1507 // No backward 1508 // No backward
1508 return index_.LookupMetadata(target, publicId, metadata); 1509 return index_.LookupMetadata(target, publicId, level, metadata);
1509 } 1510 }
1510 } 1511 }
1511 1512
1512 1513
1513 void ServerContext::AddChildInstances(SetOfInstancesJob& job, 1514 void ServerContext::AddChildInstances(SetOfInstancesJob& job,