Mercurial > hg > orthanc
comparison OrthancServer/DatabaseWrapper.cpp @ 1242:58e6a89c3ef4
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 05 Dec 2014 17:37:27 +0100 |
parents | 90d2f320862d |
children | a0e420c5f2b8 |
comparison
equal
deleted
inserted
replaced
1241:90d2f320862d | 1242:58e6a89c3ef4 |
---|---|
692 { | 692 { |
693 int64_t seq = s.ColumnInt64(0); | 693 int64_t seq = s.ColumnInt64(0); |
694 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(1)); | 694 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(1)); |
695 std::string publicId = s.ColumnString(2); | 695 std::string publicId = s.ColumnString(2); |
696 | 696 |
697 ExportedResource resource(seq, | |
698 resourceType, | |
699 publicId, | |
700 s.ColumnString(3), // modality | |
701 s.ColumnString(8), // date | |
702 s.ColumnString(4), // patient ID | |
703 s.ColumnString(5), // study instance UID | |
704 s.ColumnString(6), // series instance UID | |
705 s.ColumnString(7)); // sop instance UID | |
706 | |
697 Json::Value item = Json::objectValue; | 707 Json::Value item = Json::objectValue; |
698 item["Seq"] = static_cast<int>(seq); | 708 item["Seq"] = static_cast<int>(seq); |
699 item["ResourceType"] = EnumerationToString(resourceType); | 709 item["ResourceType"] = EnumerationToString(resourceType); |
700 item["ID"] = publicId; | 710 item["ID"] = publicId; |
701 item["Path"] = GetBasePath(resourceType, publicId); | 711 item["Path"] = GetBasePath(resourceType, publicId); |