Make Bulk Data excluded from Metadata configurable dcm4che/dcm4chee-a…

…rc-light#1753
dcm4che-dockerfiles · Dec 21, 2018 · 756ad68 · 756ad68
1 parent 3d07f71
commit 756ad68
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/ldap/data/default-config.ldif b/ldap/data/default-config.ldif
@@ -47,6 +47,7 @@ dcmKeyStoreType: ${env.KEYSTORE_TYPE}
 dcmTrustStoreURL: file://${env.TRUSTSTORE}
 dcmRejectExpiredStudiesAETitle: DCM4CHEE
 dcmKeyStoreURL: file://${env.KEYSTORE}
+dcmAuditSpoolDirectory: ${jboss.server.data.dir}/audit-spool
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.74
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.40
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.73
@@ -67,7 +68,6 @@ dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.71
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.79.1
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.59
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.78.6
-dcmAuditSpoolDirectory: ${jboss.server.data.dir}/audit-spool
 objectClass: dicomDevice
 objectClass: dcmDevice
 objectClass: dcmArchiveDevice
@@ -98,6 +98,7 @@ dcmWadoSR2TextTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/dsr2text.xsl
 dcmPurgeQueueMessagePollingInterval: PT1H
 dcmKeyStorePin: ${env.KEYSTORE_PASSWORD}
 dicomInstalled: TRUE
+dcmBulkDataDescriptorID: default
 dcmCompressionAETitle: DCM4CHEE
 dicomSoftwareVersion: 5.15.1
 dcmPurgeStoragePollingInterval: PT5M
@@ -877,6 +878,11 @@ dicomNetworkConnectionReference: cn=dicom,dicomDeviceName=dcm4chee-arc,cn=Device
 dicomAETitle: IOCM_REGULAR_USE
 dicomAssociationAcceptor: TRUE
 
+dn: dcmBulkDataDescriptorID=default,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+dcmBulkDataVRLengthThreshold: DS,FD,FL,IS,LT,OB,OD,OF,OL,OW,UC,UN,UR,UT=1024
+dcmBulkDataDescriptorID: default
+objectClass: dcmBulkDataDescriptor
+
 dn: dcmExporterID=CalculateStudySize,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dcmExporterID: CalculateStudySize
 dicomDescription: Calculate Study Size

diff --git a/ldap/data/update-config-5.15.1.ldif b/ldap/data/update-config-5.15.1.ldif
@@ -4,6 +4,15 @@ dn: dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc
 changetype: modify
 replace: dicomSoftwareVersion
 dicomSoftwareVersion: 5.15.1
+-
+replace: dcmBulkDataDescriptorID
+dcmBulkDataDescriptorID: default
+
+dn: dcmBulkDataDescriptorID=default,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: add
+dcmBulkDataVRLengthThreshold: DS,FD,FL,IS,LT,OB,OD,OF,OL,OW,UC,UN,UR,UT=1024
+dcmBulkDataDescriptorID: default
+objectClass: dcmBulkDataDescriptor
 
 dn: dcmAttributeSetID=study+dcmAttributeSetType=QIDO_RS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 changetype: add