# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1648648940 -7200
# Node ID ee398adfeb8ec0c4a8162fa528b7a9a301bc8a34
# Parent  0d7c0bbe6c901407681a99708ad1fc09f619567e# Parent  281a599f533812e3e049ee5f3f41140ba39a702e
merge default -> more-tags

diff -r 0d7c0bbe6c90 -r ee398adfeb8e .hgtags
--- a/.hgtags	Wed Mar 23 09:24:07 2022 +0100
+++ b/.hgtags	Wed Mar 30 16:02:20 2022 +0200
@@ -39,3 +39,4 @@
 644a3248b69d7adfc5b776cd0971caa00a376451 Orthanc-1.9.6
 2c142e070f1992bdef64a0b7f7ca30f3365ee9f7 Orthanc-1.9.7
 06eea14c59062da8a66b9bd0bbdf4c127132802e Orthanc-1.10.0
+8121c8aab919002fef882ac3b33eaeca350b1685 Orthanc-1.10.1
diff -r 0d7c0bbe6c90 -r ee398adfeb8e Database/2022-03-08-RicSmi.dcm
Binary file Database/2022-03-08-RicSmi.dcm has changed
diff -r 0d7c0bbe6c90 -r ee398adfeb8e Plugins/WSI/Run.py
--- a/Plugins/WSI/Run.py	Wed Mar 23 09:24:07 2022 +0100
+++ b/Plugins/WSI/Run.py	Wed Mar 30 16:02:20 2022 +0200
@@ -109,12 +109,15 @@
         
 def CallDicomizer(suffix):
     CallCommand([ args.dicomizer,
+                  '--orthanc=http://%s:%s' % (args.server, args.rest),
                   '--username=%s' % args.username,
-                  '--password=%s' % args.password ] + suffix)
+                  '--password=%s' % args.password ] + suffix
+                  )
 
     
 def CallDicomToTiff(suffix):
     CallCommand([ args.to_tiff,
+                  '--orthanc=http://%s:%s' % (args.server, args.rest),
                   '--username=%s' % args.username,
                   '--password=%s' % args.password ] + suffix)
 
diff -r 0d7c0bbe6c90 -r ee398adfeb8e Tests/Tests.py
--- a/Tests/Tests.py	Wed Mar 23 09:24:07 2022 +0100
+++ b/Tests/Tests.py	Wed Mar 30 16:02:20 2022 +0200
@@ -8648,3 +8648,13 @@
         self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
         self.assertEqual('1', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances'])
 
+    def test_dicomweb_jpeg2k_implicit(self):
+        # This is a file encoded using 1.2.840.10008.1.2.4.90 transfer
+        # syntax, in which most DICOM tags have the "UN" value
+        # representation. Support introduced in Orthanc 1.10.1.
+        # https://groups.google.com/g/orthanc-users/c/86fobx3ZyoM/m/KBG17un6AQAJ
+        a = UploadInstance(_REMOTE, '2022-03-08-RicSmi.dcm') ['ID']
+        b = DoGet(_REMOTE, '/instances/%s/file' % a,
+                  headers = { 'Accept' : 'application/dicom+json' })
+        self.assertEqual(b['0020000D']['Value'][0], '1.2.276.0.7230010.3.1.2.2358427580.3460.1646695830.793')
+        self.assertEqual(b['0020000E']['Value'][0], '1.2.276.0.7230010.3.1.3.2358427580.3460.1646695830.794')