comparison OrthancServer/OrthancRestApi.cpp @ 321:47a709e22d1f

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Jan 2013 15:21:42 +0100
parents 6253c70b197b
children a58a8be26aff
comparison
equal deleted inserted replaced
320:1b0ffed55ab0 321:47a709e22d1f
987 replacements.insert(std::make_pair(DicomTag(0x0012, 0x0063), "Orthanc " ORTHANC_VERSION " - PS 3.15-2008 Table E.1-1")); 987 replacements.insert(std::make_pair(DicomTag(0x0012, 0x0063), "Orthanc " ORTHANC_VERSION " - PS 3.15-2008 Table E.1-1"));
988 988
989 // Set the PatientIdentityRemoved 989 // Set the PatientIdentityRemoved
990 replacements.insert(std::make_pair(DicomTag(0x0012, 0x0062), "YES")); 990 replacements.insert(std::make_pair(DicomTag(0x0012, 0x0062), "YES"));
991 991
992 replacements.insert(std::make_pair(DICOM_TAG_STUDY_INSTANCE_UID, 992 // Generate random study UID if not specified
993 FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Study))); 993 if (replacements.find(DICOM_TAG_STUDY_INSTANCE_UID) == replacements.end())
994 replacements.insert(std::make_pair(DICOM_TAG_SERIES_INSTANCE_UID, 994 {
995 FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Series))); 995 replacements.insert(std::make_pair(DICOM_TAG_STUDY_INSTANCE_UID,
996 FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Study)));
997 }
998
999 // Generate random series UID if not specified
1000 if (replacements.find(DICOM_TAG_SERIES_INSTANCE_UID) == replacements.end())
1001 {
1002 replacements.insert(std::make_pair(DICOM_TAG_SERIES_INSTANCE_UID,
1003 FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel_Series)));
1004 }
996 } 1005 }
997 1006
998 1007
999 static bool ParseModifyRequest(Removals& removals, 1008 static bool ParseModifyRequest(Removals& removals,
1000 Replacements& replacements, 1009 Replacements& replacements,
1082 ParseRemovals(additionalRemovals, removalsPart); 1091 ParseRemovals(additionalRemovals, removalsPart);
1083 1092
1084 for (Removals::iterator it = additionalRemovals.begin(); 1093 for (Removals::iterator it = additionalRemovals.begin();
1085 it != additionalRemovals.end(); it++) 1094 it != additionalRemovals.end(); it++)
1086 { 1095 {
1087 removals.erase(*it); 1096 removals.insert(*it);
1088 } 1097 }
1089 1098
1090 ParseReplacements(replacements, replacementsPart); 1099 ParseReplacements(replacements, replacementsPart);
1091 1100
1092 // Generate random Patient's Name if none is specified 1101 // Generate random Patient's Name if none is specified