Add support for repository query

pydicom · Nov 14, 2023 · 4f60c68 · 4f60c68
1 parent 4077e56
commit 4f60c68
Show file tree

Hide file tree

Showing 7 changed files with 276 additions and 137 deletions.
diff --git a/docs/changelog/v2.1.0.rst b/docs/changelog/v2.1.0.rst
@@ -18,6 +18,9 @@ Enhancements
 
 * Added :func:`~pynetdicom.sop_class.register_uid` to make registering new
   private and public SOP Classes easier (:issue:`799`)
+* Added support for *Repository Query* to
+  :meth:`~pynetdicom.association.Association.send_c_find` and
+  :class:`~pynetdicom.service_class.QueryRetrieveServiceClass` (:issue:`878`)
 
 Changes
 .......

diff --git a/docs/service_classes/query_retrieve_service_class.rst b/docs/service_classes/query_retrieve_service_class.rst
@@ -10,33 +10,35 @@ Supported SOP Classes
 
 .. _qr_find_sops:
 
-+-----------------------------+---------------------------------------------------+
-| UID                         | SOP Class                                         |
-+=============================+===================================================+
-| 1.2.840.10008.5.1.4.1.2.1.1 | PatientRootQueryRetrieveInformationModelFind      |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.2.1 | StudyRootQueryRetrieveInformationModelFind        |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.3.1 | PatientStudyOnlyQueryRetrieveInformationModelFind |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.1.2 | PatientRootQueryRetrieveInformationModelMove      |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.2.2 | StudyRootQueryRetrieveInformationModelMove        |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.3.2 | PatientStudyOnlyQueryRetrieveInformationModelMove |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.4.2 | CompositeInstanceRootRetrieveMove                 |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.1.3 | PatientRootQueryRetrieveInformationModelGet       |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.2.3 | StudyRootQueryRetrieveInformationModelGet         |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.3.3 | PatientStudyOnlyQueryRetrieveInformationModelGet  |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.5.3 | CompositeInstanceRetrieveWithoutBulkDataGet       |
-+-----------------------------+---------------------------------------------------+
-| 1.2.840.10008.5.1.4.1.2.4.3 | CompositeInstanceRootRetrieveGet                  |
-+-----------------------------+---------------------------------------------------+
++-------------------------------+---------------------------------------------------+
+| UID                           | SOP Class                                         |
++===============================+===================================================+
+| 1.2.840.10008.5.1.4.1.2.1.1   | PatientRootQueryRetrieveInformationModelFind      |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.2.1   | StudyRootQueryRetrieveInformationModelFind        |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.3.1   | PatientStudyOnlyQueryRetrieveInformationModelFind |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.1.2   | PatientRootQueryRetrieveInformationModelMove      |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.2.2   | StudyRootQueryRetrieveInformationModelMove        |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.3.2   | PatientStudyOnlyQueryRetrieveInformationModelMove |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.4.2   | CompositeInstanceRootRetrieveMove                 |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.1.3   | PatientRootQueryRetrieveInformationModelGet       |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.2.3   | StudyRootQueryRetrieveInformationModelGet         |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.3.3   | PatientStudyOnlyQueryRetrieveInformationModelGet  |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.5.3   | CompositeInstanceRetrieveWithoutBulkDataGet       |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.2.4.3   | CompositeInstanceRootRetrieveGet                  |
++-------------------------------+---------------------------------------------------+
+| 1.2.840.10008.5.1.4.1.1.201.6 | RepositoryQuery                                   |
++-------------------------------+---------------------------------------------------+
 
 DIMSE Services
 --------------
@@ -111,8 +113,13 @@ Query/Retrieve (Find) Service Statuses
 +==================+==========+==============================================+
 | 0xA700           | Failure  | Out of resources                             |
 +------------------+----------+----------------------------------------------+
+| 0xA710           | Failure  | Invalid prior record key                     |
++------------------+----------+----------------------------------------------+
 | 0xA900           | Failure  | Dataset does not match SOP Class             |
 +------------------+----------+----------------------------------------------+
+| 0xB001           | Warning  | Matching reached response limit, subsequent  |
+|                  |          | request may return additional matches        |
++------------------+----------+----------------------------------------------+
 | 0xC000 to 0xCFFF | Failure  | Unable to process                            |
 +------------------+----------+----------------------------------------------+
 | 0xFF00           | Pending  | Matches are continuing                       |