Mercurial > hg > orthanc

diff OrthancServer/DicomProtocol/DicomFindAnswers.cpp @ 1797:23722a191e4e worklists

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
worklists are working
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 20 Nov 2015 11:37:58 +0100
parents bdcc1dba4a53
children 559956d5ceb2
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/DicomFindAnswers.cpp	Thu Nov 19 18:32:00 2015 +0100
+++ b/OrthancServer/DicomProtocol/DicomFindAnswers.cpp	Fri Nov 20 11:37:58 2015 +0100
@@ -48,12 +48,22 @@
   private:
     ParsedDicomFile* dicom_;
     DicomMap*        map_;
-    
+
+    void CleanupDicom()
+    {
+      if (dicom_ != NULL)
+      {
+        dicom_->Remove(DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID);
+        dicom_->Remove(DICOM_TAG_SOP_INSTANCE_UID);
+      }
+    }
+
   public:
     Answer(ParsedDicomFile& dicom) : 
       dicom_(dicom.Clone()),
       map_(NULL)
     {
+      CleanupDicom();
     }
 
     Answer(const char* dicom,
@@ -61,6 +71,7 @@
       dicom_(new ParsedDicomFile(dicom, size)),
       map_(NULL)
     {
+      CleanupDicom();
     }
 
     Answer(const DicomMap& map) :