# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1348578066 -7200
# Node ID a842914576082e61a5fa32ad4b0c36c169592e2b
# Parent  a7bffca290311aad6300a1d5160804b9e5d5c89f
fix of multi-frames

diff -r a7bffca29031 -r a84291457608 Core/DicomFormat/DicomMap.cpp
--- a/Core/DicomFormat/DicomMap.cpp	Tue Sep 25 12:06:30 2012 +0200
+++ b/Core/DicomFormat/DicomMap.cpp	Tue Sep 25 15:01:06 2012 +0200
@@ -66,7 +66,6 @@
     DicomTag(0x0020, 0x0011),   // SeriesNumber
     //DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES,
     DICOM_TAG_IMAGES_IN_ACQUISITION,
-    DICOM_TAG_NUMBER_OF_FRAMES,
     DICOM_TAG_NUMBER_OF_SLICES,
     DICOM_TAG_SERIES_INSTANCE_UID
   };
@@ -78,6 +77,7 @@
     DicomTag(0x0020, 0x0012),   // AcquisitionNumber
     DICOM_TAG_IMAGE_INDEX,
     DICOM_TAG_INSTANCE_NUMBER,
+    DICOM_TAG_NUMBER_OF_FRAMES,
     DICOM_TAG_SOP_INSTANCE_UID
   };
 
diff -r a7bffca29031 -r a84291457608 OrthancServer/ServerIndex.cpp
--- a/OrthancServer/ServerIndex.cpp	Tue Sep 25 12:06:30 2012 +0200
+++ b/OrthancServer/ServerIndex.cpp	Tue Sep 25 15:01:06 2012 +0200
@@ -307,7 +307,7 @@
     s.BindString(2, dicomSeries);
 
     const DicomValue* expectedNumberOfInstances;
-    if ((expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_FRAMES)) != NULL ||
+    if (//(expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_FRAMES)) != NULL ||
         (expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL ||
         //(expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL ||
         (expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL)