comparison OrthancServer/Plugins/Engine/OrthancPluginDatabaseV3.cpp @ 5215:8b6da4fdf9fe db-protobuf

cleaning ResourcesContent::TagValue and ResourcesContent::Metadata
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 03 Apr 2023 14:17:39 +0200
parents 055428d92772
children 450ac804d3af
comparison
equal deleted inserted replaced
5214:a9d00b17a48e 5215:8b6da4fdf9fe
899 899
900 for (ResourcesContent::ListTags::const_iterator 900 for (ResourcesContent::ListTags::const_iterator
901 it = content.GetListTags().begin(); it != content.GetListTags().end(); ++it) 901 it = content.GetListTags().begin(); it != content.GetListTags().end(); ++it)
902 { 902 {
903 OrthancPluginResourcesContentTags tmp; 903 OrthancPluginResourcesContentTags tmp;
904 tmp.resource = it->resourceId_; 904 tmp.resource = it->GetResourceId();
905 tmp.group = it->tag_.GetGroup(); 905 tmp.group = it->GetTag().GetGroup();
906 tmp.element = it->tag_.GetElement(); 906 tmp.element = it->GetTag().GetElement();
907 tmp.value = it->value_.c_str(); 907 tmp.value = it->GetValue().c_str();
908 908
909 if (it->isIdentifier_) 909 if (it->IsIdentifier())
910 { 910 {
911 identifierTags.push_back(tmp); 911 identifierTags.push_back(tmp);
912 } 912 }
913 else 913 else
914 { 914 {
918 918
919 for (ResourcesContent::ListMetadata::const_iterator 919 for (ResourcesContent::ListMetadata::const_iterator
920 it = content.GetListMetadata().begin(); it != content.GetListMetadata().end(); ++it) 920 it = content.GetListMetadata().begin(); it != content.GetListMetadata().end(); ++it)
921 { 921 {
922 OrthancPluginResourcesContentMetadata tmp; 922 OrthancPluginResourcesContentMetadata tmp;
923 tmp.resource = it->resourceId_; 923 tmp.resource = it->GetResourceId();
924 tmp.metadata = it->metadata_; 924 tmp.metadata = it->GetType();
925 tmp.value = it->value_.c_str(); 925 tmp.value = it->GetValue().c_str();
926 metadata.push_back(tmp); 926 metadata.push_back(tmp);
927 } 927 }
928 928
929 assert(identifierTags.size() + mainDicomTags.size() == content.GetListTags().size() && 929 assert(identifierTags.size() + mainDicomTags.size() == content.GetListTags().size() &&
930 metadata.size() == content.GetListMetadata().size()); 930 metadata.size() == content.GetListMetadata().size());