Skip to content

Commit

Permalink
Accept Waveform Annotation SR by default configuration #4565
Browse files Browse the repository at this point in the history
  • Loading branch information
@gunterze
gunterze committed Sep 19, 2024
1 parent 5885f83 commit 5727f5c
Show file tree
Hide file tree
Showing 7 changed files with 177 additions and 39 deletions.
12 changes: 12 additions & 0 deletions dcm4chee-arc-assembly/src/main/resources/ldap/5.33.0/update-AS_RECEIVED-5.33.0.ldif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,15 @@ dn: dcmWebAppName=AS_RECEIVED,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM C
changetype: modify
replace: dicomDescription
dicomDescription: Retrieve instances as received without hiding rejected instances

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=AS_RECEIVED,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
changetype: add
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU

23 changes: 23 additions & 0 deletions dcm4chee-arc-assembly/src/main/resources/ldap/5.33.0/update-DCM4CHEE-5.33.0.ldif
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: 1

dn: cn=Waveform Annotation SR Storage SCP,dicomAETitle=DCM4CHEE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
changetype: add
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCP
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCP

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=DCM4CHEE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
changetype: add
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU
12 changes: 12 additions & 0 deletions dcm4chee-arc-assembly/src/main/resources/ldap/5.33.0/update-IOCM_REGULAR_USE-5.33.0.ldif
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 1

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=IOCM_REGULAR_USE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
changetype: add
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU
8 changes: 8 additions & 0 deletions dcm4chee-arc-assembly/src/main/resources/ldap/5.33.0/update-dev-5.33.0.ldif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ changetype: modify
replace: dicomVendorData
dicomVendorData:< file:vendor-data.zip

dn: dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
changetype: modify
add: dcmWadoSupportedSRClasses
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.77

dn: dcmQueryRetrieveViewID=iocmDisabled,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
changetype: add
dcmQueryRetrieveViewID: iocmDisabled
Expand All @@ -21,3 +26,6 @@ dcmTag: 00081070
dcmTag: 00081072
dcmTag: 00401012
dcmTag: 0040A078

dn: dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org

11 changes: 11 additions & 0 deletions dcm4chee-arc-assembly/src/main/resources/ldap/5.33.0/update-storescp-5.33.0.ldif
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 1

dn: cn=Waveform Annotation SR Storage SCP,dicomAETitle=STORESCP,dicomDeviceName=storescp,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
changetype: add
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCP
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCP
54 changes: 50 additions & 4 deletions dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.67
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.11
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.22
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.33
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.77
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.69
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.35
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.68
Expand Down Expand Up @@ -822,6 +823,15 @@ objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Video Endoscopic Image Storage SCP

dn: cn=Waveform Annotation SR Storage SCP,dicomAETitle=STORESCP,dicomDeviceName=storescp,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCP
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCP

dn: cn=Ambulatory ECG Waveform Storage SCP,dicomAETitle=STORESCP,dicomDeviceName=storescp,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.9.1.3
dicomTransferRole: SCP
Expand Down Expand Up @@ -5601,6 +5611,26 @@ objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Video Endoscopic Image Storage SCU

dn: cn=Waveform Annotation SR Storage SCP,dicomAETitle=DCM4CHEE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCP
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCP

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=DCM4CHEE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU

dn: cn=Ambulatory ECG Waveform Storage SCP,dicomAETitle=DCM4CHEE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.9.1.3
dicomTransferRole: SCP
Expand Down Expand Up @@ -11616,6 +11646,16 @@ objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Video Endoscopic Image Storage SCU

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=AS_RECEIVED,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU

dn: cn=Ambulatory ECG Waveform Storage SCU,dicomAETitle=AS_RECEIVED,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.9.1.3
dicomTransferRole: SCU
Expand Down Expand Up @@ -15148,6 +15188,16 @@ objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Video Endoscopic Image Storage SCU

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=IOCM_REGULAR_USE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU

dn: cn=Ambulatory ECG Waveform Storage SCU,dicomAETitle=IOCM_REGULAR_USE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.9.1.3
dicomTransferRole: SCU
Expand Down Expand Up @@ -17673,10 +17723,6 @@ dn: dicomAETitle=WORKLIST,cn=Unique AE Titles Registry,cn=DICOM Configuration,dc
objectClass: dicomUniqueAETitle
dicomAETitle: WORKLIST

dn: dicomAETitle=NEW_AET_A,cn=Unique AE Titles Registry,cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: dicomUniqueAETitle
dicomAETitle: NEW_AET_A

dn: dicomAETitle=AS_RECEIVED,cn=Unique AE Titles Registry,cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: dicomUniqueAETitle
dicomAETitle: AS_RECEIVED
Expand Down
96 changes: 61 additions & 35 deletions dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,5 @@
version: 1

dn: cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: dicomConfigurationRoot
cn: DICOM Configuration

dn: cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: dicomDevicesRoot
cn: Devices

dn: cn=Unique AE Titles Registry,cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: dicomUniqueAETitlesRegistryRoot
cn: Unique AE Titles Registry

dn: cn=Unique HL7 Application Names Registry,cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: hl7UniqueApplicationNamesRegistryRoot
cn: Unique HL7 Application Names Registry

dn: cn=Unique Web Application Names Registry,cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: dcmUniqueWebAppNamesRegistryRoot
cn: Unique Web Application Names Registry

dn: dicomDeviceName=getscu,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomInstalled: TRUE
dicomIssuerOfPatientID: Site A&1.2.40.0.13.1.1.999.111.1111&ISO
Expand Down Expand Up @@ -202,6 +182,7 @@ dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.67
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.11
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.22
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.33
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.77
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.69
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.35
dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.68
Expand Down Expand Up @@ -1180,6 +1161,15 @@ objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Video Endoscopic Image Storage SCP

dn: cn=Waveform Annotation SR Storage SCP,dicomAETitle=STORESCP,dicomDeviceName=storescp,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCP
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCP

dn: cn=Ambulatory ECG Waveform Storage SCP,dicomAETitle=STORESCP,dicomDeviceName=storescp,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.9.1.3
dicomTransferRole: SCP
Expand Down Expand Up @@ -3340,6 +3330,17 @@ objectClass: dcmStorage
dcmStorageID: fs1
dcmURI: ${jboss.server.data.url}/fs1/

dn: cn=Merge MWL MPPS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dcmDIMSE: N_CREATE_RQ
dicomTransferRole: SCU
dcmCoercionParam: mwl-entity-to-merge=mpps
dcmCoercionParam: xsl-no-keyword=true
dcmCoercionParam: match-by=AccessionNumber
dcmProperty: SendingApplicationEntityTitle=MERGE_MWL_MPPS
objectClass: dcmArchiveAttributeCoercion2
dcmURI: merge-mwl:${jboss.server.temp.url}/dcm4chee-arc/mwl2study.xsl
cn: Merge MWL MPPS

dn: dcmEntity=Patient,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dcmTag: 00080005
dcmTag: 00100010
Expand Down Expand Up @@ -3416,17 +3417,6 @@ objectClass: dcmArchiveAttributeCoercion2
dcmURI: merge-mwl:${jboss.server.temp.url}/dcm4chee-arc/mwl2study.xsl
cn: Merge MWL Study

dn: cn=Merge MWL MPPS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dcmDIMSE: N_CREATE_RQ
dicomTransferRole: SCU
dcmCoercionParam: xsl-no-keyword=true
dcmCoercionParam: match-by=AccessionNumber
dcmCoercionParam: mwl-entity-to-merge=mpps
dcmProperty: SendingApplicationEntityTitle=MERGE_MWL_MPPS
objectClass: dcmArchiveAttributeCoercion2
dcmURI: merge-mwl:${jboss.server.temp.url}/dcm4chee-arc/mwl2mpps.xsl
cn: Merge MWL MPPS

dn: cn=Supplement MPPS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dcmSOPClass: 1.2.840.10008.3.1.2.3.3
dcmDIMSE: N_CREATE_RQ
Expand Down Expand Up @@ -6380,6 +6370,26 @@ objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Video Endoscopic Image Storage SCU

dn: cn=Waveform Annotation SR Storage SCP,dicomAETitle=DCM4CHEE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCP
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCP

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=DCM4CHEE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU

dn: cn=Ambulatory ECG Waveform Storage SCP,dicomAETitle=DCM4CHEE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.9.1.3
dicomTransferRole: SCP
Expand Down Expand Up @@ -12395,6 +12405,16 @@ objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Video Endoscopic Image Storage SCU

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=AS_RECEIVED,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU

dn: cn=Ambulatory ECG Waveform Storage SCU,dicomAETitle=AS_RECEIVED,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.9.1.3
dicomTransferRole: SCU
Expand Down Expand Up @@ -15927,6 +15947,16 @@ objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Video Endoscopic Image Storage SCU

dn: cn=Waveform Annotation SR Storage SCU,dicomAETitle=IOCM_REGULAR_USE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.88.77
dicomTransferRole: SCU
dicomTransferSyntax: 1.2.840.10008.1.2
dicomTransferSyntax: 1.2.840.10008.1.2.1
dicomTransferSyntax: 1.2.840.10008.1.2.1.99
objectClass: dicomTransferCapability
objectClass: dcmTransferCapability
cn: Waveform Annotation SR Storage SCU

dn: cn=Ambulatory ECG Waveform Storage SCU,dicomAETitle=IOCM_REGULAR_USE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
dicomSOPClass: 1.2.840.10008.5.1.4.1.1.9.1.3
dicomTransferRole: SCU
Expand Down Expand Up @@ -18488,10 +18518,6 @@ dn: dicomAETitle=WORKLIST,cn=Unique AE Titles Registry,cn=DICOM Configuration,dc
objectClass: dicomUniqueAETitle
dicomAETitle: WORKLIST

dn: dicomAETitle=NEW_AET_A,cn=Unique AE Titles Registry,cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: dicomUniqueAETitle
dicomAETitle: NEW_AET_A

dn: dicomAETitle=STGCMTSCU,cn=Unique AE Titles Registry,cn=DICOM Configuration,dc=dcm4che,dc=org
objectClass: dicomUniqueAETitle
dicomAETitle: STGCMTSCU
Expand Down

0 comments on commit 5727f5c

Please sign in to comment.