# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1481031646 -3600
# Node ID 307365d0991ac5297c85ae0ae19b433574a3d0d9
# Parent  af60b784d2b8c5143d9e96acae48975a1f32bcf3# Parent  feabd88c88e4fa32474da6e3dcbdb5d42f1d6500
merge

diff -r feabd88c88e4 -r 307365d0991a NEWS
--- a/NEWS	Sun Dec 04 09:26:44 2016 +0100
+++ b/NEWS	Tue Dec 06 14:40:46 2016 +0100
@@ -38,6 +38,7 @@
 * Improved robustness against files with no PatientID
 * Upgrade to curl 7.50.3 for static and Windows builds
 * Content-Type for JSON documents is now "application/json; charset=utf-8"
+* Ignore "Group Length" tags in C-FIND queries
 
 
 Version 1.1.0 (2016/06/27)
diff -r feabd88c88e4 -r 307365d0991a OrthancServer/Search/HierarchicalMatcher.cpp
--- a/OrthancServer/Search/HierarchicalMatcher.cpp	Sun Dec 04 09:26:44 2016 +0100
+++ b/OrthancServer/Search/HierarchicalMatcher.cpp	Tue Dec 06 14:40:46 2016 +0100
@@ -86,9 +86,9 @@
       }
 
       DicomTag tag(FromDcmtkBridge::Convert(element->getTag()));
-      if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
+      if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET ||   // Ignore encoding
+          tag.GetElement() == 0x0000)  // Ignore all "Group Length" tags
       {
-        // Ignore this specific tag
         continue;
       }