# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1593452002 -7200
# Node ID 160ec8417874b227dc7c858ca5aee1c1a4e211a9
# Parent  dcf4d83374a6138a981ac27a545e03d0fc943f0f# Parent  a2060a76ed6aa3becf5c12c7b46bb3259ac7cfca
integration mainline->framework

diff -r dcf4d83374a6 -r 160ec8417874 NEWS
--- a/NEWS	Fri Jun 26 09:47:51 2020 +0200
+++ b/NEWS	Mon Jun 29 19:33:22 2020 +0200
@@ -13,7 +13,8 @@
 Maintenance
 -----------
 
-* Issue #182: Better handling of errors in plugins reading chunked HTTP body
+* Issue #182: Better reporting of errors in plugins reading chunked HTTP body
+* Fix issue #183 (C-ECHO always fails in Orthanc Explorer, regression from 1.6.1 to 1.7.0)
 
 
 Version 1.7.1 (2020-05-27)
diff -r dcf4d83374a6 -r 160ec8417874 OrthancServer/OrthancExplorer/query-retrieve.js
--- a/OrthancServer/OrthancExplorer/query-retrieve.js	Fri Jun 26 09:47:51 2020 +0200
+++ b/OrthancServer/OrthancExplorer/query-retrieve.js	Mon Jun 29 19:33:22 2020 +0200
@@ -55,6 +55,7 @@
 
   $.ajax({
     url: '../modalities/' + server + '/echo',
+    data: '{}',  // Fix for issue #183 (regression from Orthanc 1.6.1 to 1.7.0)
     type: 'POST', 
     cache: false,
     async: false,
diff -r dcf4d83374a6 -r 160ec8417874 OrthancServer/Resources/Samples/Python/ArchiveStudiesInTimeRange.py
--- a/OrthancServer/Resources/Samples/Python/ArchiveStudiesInTimeRange.py	Fri Jun 26 09:47:51 2020 +0200
+++ b/OrthancServer/Resources/Samples/Python/ArchiveStudiesInTimeRange.py	Mon Jun 29 19:33:22 2020 +0200
@@ -62,8 +62,16 @@
     study = RestToolbox.DoGet('%s/studies/%s' % (URL, studyId))['MainDicomTags']
 
     # Retrieve the DICOM tags of the parent patient of this study
+
+    # Case 1: Baseline version
     patient = RestToolbox.DoGet('%s/studies/%s/patient' % (URL, studyId))['MainDicomTags']
 
+    # Case 2: Tweaked version that can be used if several patients
+    # share the same "Patient ID", but have different "Patient Name"
+    # (which is invalid according to the DICOM standard).
+    # https://groups.google.com/d/msg/orthanc-users/58AxIkxFbZs/N6Knub8MAgAJ
+    # patient = RestToolbox.DoGet('%s/studies/%s' % (URL, studyId)) ['PatientMainDicomTags']
+
     # Check that the StudyDate tag lies within the given range
     studyDate = study['StudyDate'][:8]
     if studyDate >= START and studyDate <= END: