QIDO-RS: support referring a pre-configured Attribute Set by Query Pa…

…rameter 'includefield' #1690
dcm4che · Nov 28, 2018 · 998c14f · 998c14f
1 parent 1b9af35
commit 998c14f
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 5 deletions.
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif
@@ -78,7 +78,7 @@ dcmPurgeQueueMessagePollingInterval: PT1H
 dcmKeyStorePin: secret
 dicomInstalled: TRUE
 dcmCompressionAETitle: DCM4CHEE
-dicomSoftwareVersion: 5.14.1
+dicomSoftwareVersion: 5.15.1
 dcmPurgeStoragePollingInterval: PT5M
 dcmRejectionNoteStorageAET: DCM4CHEE
 dcmRejectExpiredSeriesFetchSize: 10
@@ -1029,6 +1029,26 @@ dcmProperty: actions=study-reject-export,study-reject,study-export
 objectClass: dcmAttributeSet
 dcmAttributeSetNumber: 1
 
+dn: dcmAttributeSetID=study+dcmAttributeSetType=QIDO_RS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+dcmAttributeSetTitle: Sample Study Attribute Set
+dcmTag: 00080020
+dcmTag: 00080030
+dcmTag: 00080050
+dcmTag: 00080061
+dcmTag: 00080090
+dcmTag: 00081030
+dcmTag: 00100010
+dcmTag: 00100020
+dcmTag: 00100030
+dcmTag: 00100040
+dcmTag: 0020000D
+dcmTag: 00200010
+dcmTag: 00201206
+dcmTag: 00201208
+dcmAttributeSetType: QIDO_RS
+dcmAttributeSetID: study
+objectClass: dcmAttributeSet
+
 dn: dcmAttributeSetID=patient+dcmAttributeSetType=DIFF_RS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dcmAttributeSetTitle: Patient attributes
 dicomDescription: Compares only Patient attributes

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif
@@ -189,7 +189,7 @@ dcmKeyStorePin: secret
 dicomInstalled: TRUE
 dcmSeriesMetadataStorageID: series-metadata
 dcmCompressionAETitle: DCM4CHEE
-dicomSoftwareVersion: 5.14.1
+dicomSoftwareVersion: 5.15.1
 dcmPurgeStoragePollingInterval: PT5M
 dcmRejectionNoteStorageAET: DCM4CHEE
 dcmRejectExpiredSeriesFetchSize: 10
@@ -1723,6 +1723,26 @@ dcmProperty: actions=study-reject-export,study-reject,study-export
 objectClass: dcmAttributeSet
 dcmAttributeSetNumber: 1
 
+dn: dcmAttributeSetID=study+dcmAttributeSetType=QIDO_RS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+dcmAttributeSetTitle: Sample Study Attribute Set
+dcmTag: 00080020
+dcmTag: 00080030
+dcmTag: 00080050
+dcmTag: 00080061
+dcmTag: 00080090
+dcmTag: 00081030
+dcmTag: 00100010
+dcmTag: 00100020
+dcmTag: 00100030
+dcmTag: 00100040
+dcmTag: 0020000D
+dcmTag: 00200010
+dcmTag: 00201206
+dcmTag: 00201208
+dcmAttributeSetType: QIDO_RS
+dcmAttributeSetID: study
+objectClass: dcmAttributeSet
+
 dn: dcmAttributeSetID=patient+dcmAttributeSetType=DIFF_RS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dcmAttributeSetTitle: Patient attributes
 dicomDescription: Compares only Patient attributes

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/update-config-5.15.1.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/update-config-5.15.1.ldif
@@ -0,0 +1,27 @@
+version: 1
+
+dn: dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: modify
+replace: dicomSoftwareVersion
+dicomSoftwareVersion: 5.15.1
+
+dn: dcmAttributeSetID=study+dcmAttributeSetType=QIDO_RS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: add
+dcmAttributeSetTitle: Sample Study Attribute Set
+dcmTag: 00080020
+dcmTag: 00080030
+dcmTag: 00080050
+dcmTag: 00080061
+dcmTag: 00080090
+dcmTag: 00081030
+dcmTag: 00100010
+dcmTag: 00100020
+dcmTag: 00100030
+dcmTag: 00100040
+dcmTag: 0020000D
+dcmTag: 00200010
+dcmTag: 00201206
+dcmTag: 00201208
+dcmAttributeSetType: QIDO_RS
+dcmAttributeSetID: study
+objectClass: dcmAttributeSet
diff --git a/dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java b/dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java
@@ -1006,7 +1006,7 @@ private static AuditSuppressCriteria suppressAuditQueryFromArchive() {
     };
 
     static final String AE_TITLE = "DCM4CHEE";
-    static final String DCM4CHEE_ARC_VERSION = "5.14.1";
+    static final String DCM4CHEE_ARC_VERSION = "5.15.1";
     static final String DCM4CHEE_ARC_KEY_JKS =  "${jboss.server.config.url}/dcm4chee-arc/key.jks";
     static final String HL7_ADT2DCM_XSL = "${jboss.server.temp.url}/dcm4chee-arc/hl7-adt2dcm.xsl";
     static final String HL7_DCM2ADT_XSL = "${jboss.server.temp.url}/dcm4chee-arc/hl7-dcm2adt.xsl";
@@ -1535,8 +1535,8 @@ private static void addArchiveDeviceExtension(Device device, ConfigType configTy
                 LEADING_CFIND_SCP_ATTRS));
         ext.addAttributeSet(newAttributeSet(AttributeSet.Type.QIDO_RS,
                 0, "study",
-                "QIDO Study attribute set",
-                "QIDO Study attribute set for CSV",
+                "Sample Study Attribute Set",
+                null,
                 QIDO_STUDY_ATTRS));
 
         ext.addRejectionNote(createRejectionNote("Quality",