# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1432220310 -7200
# Node ID 111e23bb49049730fff779e87a6c1c85f7f705f2
# Parent  f894be6e7cc180a0172f7b205623b443f628e844# Parent  feaf2840917c105383e1f1b0f4884cb0037fc7aa
integration mainline->query-retrieve

diff -r feaf2840917c -r 111e23bb4904 Core/DicomFormat/DicomMap.cpp
diff -r feaf2840917c -r 111e23bb4904 Core/DicomFormat/DicomMap.h
diff -r feaf2840917c -r 111e23bb4904 Core/DicomFormat/DicomTag.h
--- a/Core/DicomFormat/DicomTag.h	Wed May 20 15:21:26 2015 +0200
+++ b/Core/DicomFormat/DicomTag.h	Thu May 21 16:58:30 2015 +0200
@@ -97,6 +97,8 @@
   static const DicomTag DICOM_TAG_SERIES_INSTANCE_UID(0x0020, 0x000e);
   static const DicomTag DICOM_TAG_STUDY_INSTANCE_UID(0x0020, 0x000d);
   static const DicomTag DICOM_TAG_PIXEL_DATA(0x7fe0, 0x0010);
+  static const DicomTag DICOM_TAG_STUDY_DESCRIPTION(0x0008, 0x1030);
+  static const DicomTag DICOM_TAG_SERIES_DESCRIPTION(0x0008, 0x103e);
 
   static const DicomTag DICOM_TAG_IMAGE_INDEX(0x0054, 0x1330);
   static const DicomTag DICOM_TAG_INSTANCE_NUMBER(0x0020, 0x0013);
diff -r feaf2840917c -r 111e23bb4904 OrthancServer/DicomProtocol/DicomUserConnection.cpp
diff -r feaf2840917c -r 111e23bb4904 OrthancServer/OrthancFindRequestHandler.cpp
diff -r feaf2840917c -r 111e23bb4904 OrthancServer/ServerIndex.cpp
diff -r feaf2840917c -r 111e23bb4904 OrthancServer/ServerIndex.h
diff -r feaf2840917c -r 111e23bb4904 OrthancServer/main.cpp
--- a/OrthancServer/main.cpp	Wed May 20 15:21:26 2015 +0200
+++ b/OrthancServer/main.cpp	Thu May 21 16:58:30 2015 +0200
@@ -638,6 +638,29 @@
   int status = 0;
   try
   {
+    if (1)
+    {
+      DicomUserConnection c;
+      c.SetLocalApplicationEntityTitle("ORTHANC");
+      c.SetRemoteApplicationEntityTitle("ORTHANC");
+      c.SetRemoteHost("localhost");
+      c.SetRemotePort(4343);
+      c.Open();
+
+      DicomMap m; // Delphine
+      m.SetValue(DICOM_TAG_PATIENT_ID, "5423962");
+      m.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "1.2.840.113845.11.1000000001951524609.20121203131451.1457891");
+      m.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "1.2.840.113619.2.278.3.262930758.589.1354512768.115");
+      m.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "1.3.12.2.1107.5.2.33.37097.2012041613043195815872177");
+
+      DicomFindAnswers fnd;
+      c.FindInstance(fnd, m);
+      //c.FindSeries(fnd, m);
+
+      printf("ok %d\n", fnd.GetSize());
+    }
+
+
     for (;;)
     {
       OrthancInitialize(configurationFile);