UPS-RS Worklist Service dcm4che#2164

mingdatacom · Sep 13, 2019 · bc92da8 · bc92da8
1 parent dbdfaaa
commit bc92da8
Show file tree

Hide file tree

Showing 198 changed files with 2,302 additions and 220 deletions.
diff --git a/dcm4chee-arc-assembly/pom.xml b/dcm4chee-arc-assembly/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.18.1</version>
+    <version>5.19.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif
@@ -1,4 +1,4 @@
-# Generated by Apache Directory Studio on August 30, 2019, 9:24:20 PM
+# Generated by Apache Directory Studio on September 13, 2019, 2:01:39 PM
 
 # SCHEMA "DCM4CHEE-ARCHIVE"
 dn: cn=dcm4chee-archive, ou=schema
@@ -3939,8 +3939,22 @@ m-name: dcmStorePermissionServiceResponse
 m-description: Emulate Store Permission Service Response on receive of the first
   object of a study by any AE. {<dicomTag>} will be replaced by the value of the
   attribute in the object.
-m-equality: caseExactIA5Match
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-equality: caseExactMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.302, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.302
+m-name: dcmDefaultWorklistLabel
+m-description: Value of Worklist Label (0074,1202) added to Workitems of N-CREAT
+ E RQs without Worklist Label (0074,1202) attribute received by any AE. If absen
+ t, the AE Title of the receiving AE will be used.
+m-equality: caseExactMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
 m-singleValue: TRUE
 
 dn: ou=comparators, cn=dcm4chee-archive, ou=schema
@@ -4481,6 +4495,7 @@ m-may: dcmQueryRetrieveViewID
 m-may: dcmRetrieveAET
 m-may: dcmReturnRetrieveAET
 m-may: dcmDefaultCharacterSet
+m-may: dcmDefaultWorklistLabel
 m-may: dcmStorageID
 m-may: dcmMetadataStorageID
 m-may: dcmSeriesMetadataStorageID
@@ -4589,6 +4604,7 @@ m-may: dcmStorePermissionServiceErrorCommentPattern
 m-may: dcmStorePermissionServiceErrorCodePattern
 m-may: dcmStorePermissionCacheStaleTimeout
 m-may: dcmStorePermissionCacheSize
+m-may: dcmStorePermissionServiceResponse
 m-may: dcmMergeMWLCacheStaleTimeout
 m-may: dcmMergeMWLCacheSize
 m-may: dcmStoreUpdateDBMaxRetries
@@ -4680,6 +4696,7 @@ m-may: dcmBulkDataDescriptorID
 m-may: dcmRetrieveAET
 m-may: dcmReturnRetrieveAET
 m-may: dcmDefaultCharacterSet
+m-may: dcmDefaultWorklistLabel
 m-may: dcmStorageID
 m-may: dcmObjectStorageID
 m-may: dcmObjectStorageCount
@@ -4732,6 +4749,7 @@ m-may: dcmStorePermissionServiceResponsePattern
 m-may: dcmStorePermissionServiceExpirationDatePattern
 m-may: dcmStorePermissionServiceErrorCommentPattern
 m-may: dcmStorePermissionServiceErrorCodePattern
+m-may: dcmStorePermissionServiceResponse
 m-may: dcmAllowRejectionForDataRetentionPolicyExpired
 m-may: dcmAcceptedUserRole
 m-may: dcmAllowDeleteStudyPermanently

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif
@@ -258,6 +258,53 @@ dcmTag: 00402400
 dcmEntity: MWL
 objectClass: dcmAttributeFilter
 
+dn: dcmEntity=UPS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+dcmTag: 00080005
+dcmTag: 00080016
+dcmTag: 00080018
+dcmTag: 00081080
+dcmTag: 00081084
+dcmTag: 00101023
+dcmTag: 00101024
+dcmTag: 00102000
+dcmTag: 00102110
+dcmTag: 00102180
+dcmTag: 001021A0
+dcmTag: 001021B0
+dcmTag: 001021C0
+dcmTag: 001021D0
+dcmTag: 00102203
+dcmTag: 0020000D
+dcmTag: 00321066
+dcmTag: 00321067
+dcmTag: 00380010
+dcmTag: 00380014
+dcmTag: 00380050
+dcmTag: 00380100
+dcmTag: 00380101
+dcmTag: 00380500
+dcmTag: 00380502
+dcmTag: 00404005
+dcmTag: 00404008
+dcmTag: 00404011
+dcmTag: 00404018
+dcmTag: 00404021
+dcmTag: 00404025
+dcmTag: 00404026
+dcmTag: 00404027
+dcmTag: 00404034
+dcmTag: 00404041
+dcmTag: 00404070
+dcmTag: 0040A370
+dcmTag: 00741200
+dcmTag: 00741202
+dcmTag: 00741204
+dcmTag: 00741210
+dcmTag: 00741216
+dcmTag: 00741224
+dcmEntity: UPS
+objectClass: dcmAttributeFilter
+
 dn: dcmEntity=MPPS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dcmTag: 00080005
 dcmTag: 00080060
@@ -393,9 +440,13 @@ dcmTag: 00080005
 dcmTag: 00100010
 dcmTag: 00100020
 dcmTag: 00100021
+dcmTag: 00100022
 dcmTag: 00100024
 dcmTag: 00100030
 dcmTag: 00100032
+dcmTag: 00100033
+dcmTag: 00100034
+dcmTag: 00100035
 dcmTag: 00100040
 dcmTag: 00100050
 dcmTag: 00100101
@@ -407,6 +458,7 @@ dcmTag: 00101060
 dcmTag: 00101080
 dcmTag: 00101081
 dcmTag: 00101090
+dcmTag: 00101100
 dcmTag: 00102150
 dcmTag: 00102152
 dcmTag: 00102154
@@ -1466,9 +1518,13 @@ dcmTag: 00082218
 dcmTag: 00100010
 dcmTag: 00100020
 dcmTag: 00100021
+dcmTag: 00100022
 dcmTag: 00100024
 dcmTag: 00100030
 dcmTag: 00100032
+dcmTag: 00100033
+dcmTag: 00100034
+dcmTag: 00100035
 dcmTag: 00100040
 dcmTag: 00100050
 dcmTag: 00100101
@@ -1487,6 +1543,7 @@ dcmTag: 00101060
 dcmTag: 00101080
 dcmTag: 00101081
 dcmTag: 00101090
+dcmTag: 00101100
 dcmTag: 00102000
 dcmTag: 00102110
 dcmTag: 00102150

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif
@@ -1450,8 +1450,13 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.300 NAME 'dcmTrimISO2022CharacterSet'
   SINGLE-VALUE )
 attributeTypes: ( 1.2.40.0.13.1.15.110.3.301 NAME 'dcmStorePermissionServiceResponse'
   DESC 'Emulate Store Permission Service Response on receive of the first object of a study by any AE. {<dicomTag>} will be replaced by the value of the attribute in the object.'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.302 NAME 'dcmDefaultWorklistLabel'
+  DESC 'Value of Worklist Label (0074,1202) added to Workitems of N-CREATE RQs without Worklist Label (0074,1202) attribute received by any AE. If absent, the AE Title of the receiving AE will be used.'
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
@@ -1464,6 +1469,7 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmRetrieveAET $
     dcmReturnRetrieveAET $
     dcmDefaultCharacterSet $
+    dcmDefaultWorklistLabel $
     dcmStorageID $
     dcmMetadataStorageID $
     dcmSeriesMetadataStorageID $
@@ -1572,6 +1578,7 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmStorePermissionServiceErrorCodePattern $
     dcmStorePermissionCacheStaleTimeout $
     dcmStorePermissionCacheSize $
+    dcmStorePermissionServiceResponse $
     dcmMergeMWLCacheStaleTimeout $
     dcmMergeMWLCacheSize $
     dcmStoreUpdateDBMaxRetries $
@@ -1656,6 +1663,7 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.5 NAME 'dcmArchiveNetworkAE'
     dcmRetrieveAET $
     dcmReturnRetrieveAET $
     dcmDefaultCharacterSet $
+    dcmDefaultWorklistLabel $
     dcmStorageID $
     dcmObjectStorageID $
     dcmObjectStorageCount $
@@ -1708,6 +1716,7 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.5 NAME 'dcmArchiveNetworkAE'
     dcmStorePermissionServiceExpirationDatePattern $
     dcmStorePermissionServiceErrorCommentPattern $
     dcmStorePermissionServiceErrorCodePattern $
+    dcmStorePermissionServiceResponse $
     dcmAllowRejectionForDataRetentionPolicyExpired $
     dcmAcceptedUserRole $
     dcmAllowDeleteStudyPermanently $

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif
@@ -714,6 +714,53 @@ dcmTag: 00402400
 dcmEntity: MWL
 objectClass: dcmAttributeFilter
 
+dn: dcmEntity=UPS,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+dcmTag: 00080005
+dcmTag: 00080016
+dcmTag: 00080018
+dcmTag: 00081080
+dcmTag: 00081084
+dcmTag: 00101023
+dcmTag: 00101024
+dcmTag: 00102000
+dcmTag: 00102110
+dcmTag: 00102180
+dcmTag: 001021A0
+dcmTag: 001021B0
+dcmTag: 001021C0
+dcmTag: 001021D0
+dcmTag: 00102203
+dcmTag: 0020000D
+dcmTag: 00321066
+dcmTag: 00321067
+dcmTag: 00380010
+dcmTag: 00380014
+dcmTag: 00380050
+dcmTag: 00380100
+dcmTag: 00380101
+dcmTag: 00380500
+dcmTag: 00380502
+dcmTag: 00404005
+dcmTag: 00404008
+dcmTag: 00404011
+dcmTag: 00404018
+dcmTag: 00404021
+dcmTag: 00404025
+dcmTag: 00404026
+dcmTag: 00404027
+dcmTag: 00404034
+dcmTag: 00404041
+dcmTag: 00404070
+dcmTag: 0040A370
+dcmTag: 00741200
+dcmTag: 00741202
+dcmTag: 00741204
+dcmTag: 00741210
+dcmTag: 00741216
+dcmTag: 00741224
+dcmEntity: UPS
+objectClass: dcmAttributeFilter
+
 dn: cn=THICK_SLICE,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dcmRetentionPeriod: P4D
 dcmProperty: SendingApplicationEntityTitle=STORESCU
@@ -871,9 +918,13 @@ dcmTag: 00080005
 dcmTag: 00100010
 dcmTag: 00100020
 dcmTag: 00100021
+dcmTag: 00100022
 dcmTag: 00100024
 dcmTag: 00100030
 dcmTag: 00100032
+dcmTag: 00100033
+dcmTag: 00100034
+dcmTag: 00100035
 dcmTag: 00100040
 dcmTag: 00100050
 dcmTag: 00100101
@@ -885,6 +936,7 @@ dcmTag: 00101060
 dcmTag: 00101080
 dcmTag: 00101081
 dcmTag: 00101090
+dcmTag: 00101100
 dcmTag: 00102150
 dcmTag: 00102152
 dcmTag: 00102154
@@ -2168,9 +2220,13 @@ dcmTag: 00082218
 dcmTag: 00100010
 dcmTag: 00100020
 dcmTag: 00100021
+dcmTag: 00100022
 dcmTag: 00100024
 dcmTag: 00100030
 dcmTag: 00100032
+dcmTag: 00100033
+dcmTag: 00100034
+dcmTag: 00100035
 dcmTag: 00100040
 dcmTag: 00100050
 dcmTag: 00100101
@@ -2189,6 +2245,7 @@ dcmTag: 00101060
 dcmTag: 00101080
 dcmTag: 00101081
 dcmTag: 00101090
+dcmTag: 00101100
 dcmTag: 00102000
 dcmTag: 00102110
 dcmTag: 00102150

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema b/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema
@@ -1741,8 +1741,14 @@ attributetype ( 1.2.40.0.13.1.15.110.3.300 NAME 'dcmTrimISO2022CharacterSet'
 
 attributetype ( 1.2.40.0.13.1.15.110.3.301 NAME 'dcmStorePermissionServiceResponse'
   DESC 'Emulate Store Permission Service Response on receive of the first object of a study by any AE. {<dicomTag>} will be replaced by the value of the attribute in the object.'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE )
+
+attributetype ( 1.2.40.0.13.1.15.110.3.302 NAME 'dcmDefaultWorklistLabel'
+  DESC 'Value of Worklist Label (0074,1202) added to Workitems of N-CREATE RQs without Worklist Label (0074,1202) attribute received by any AE. If absent, the AE Title of the receiving AE will be used.'
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
 
 objectclass ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
@@ -1756,6 +1762,7 @@ objectclass ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmRetrieveAET $
     dcmReturnRetrieveAET $
     dcmDefaultCharacterSet $
+    dcmDefaultWorklistLabel $
     dcmStorageID $
     dcmMetadataStorageID $
     dcmSeriesMetadataStorageID $
@@ -1950,6 +1957,7 @@ objectclass ( 1.2.40.0.13.1.15.110.4.5 NAME 'dcmArchiveNetworkAE'
     dcmRetrieveAET $
     dcmReturnRetrieveAET $
     dcmDefaultCharacterSet $
+    dcmDefaultWorklistLabel $
     dcmStorageID $
     dcmObjectStorageID $
     dcmObjectStorageCount $

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif
@@ -1450,8 +1450,13 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.300 NAME 'dcmTrimISO2022CharacterSet
   SINGLE-VALUE )
 olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.301 NAME 'dcmStorePermissionServiceResponse'
   DESC 'Emulate Store Permission Service Response on receive of the first object of a study by any AE. {<dicomTag>} will be replaced by the value of the attribute in the object.'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.302 NAME 'dcmDefaultWorklistLabel'
+  DESC 'Value of Worklist Label (0074,1202) added to Workitems of N-CREATE RQs without Worklist Label (0074,1202) attribute received by any AE. If absent, the AE Title of the receiving AE will be used.'
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
 -
 replace: olcObjectClasses
@@ -1466,6 +1471,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmRetrieveAET $
     dcmReturnRetrieveAET $
     dcmDefaultCharacterSet $
+    dcmDefaultWorklistLabel $
     dcmStorageID $
     dcmMetadataStorageID $
     dcmSeriesMetadataStorageID $
@@ -1574,6 +1580,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmStorePermissionServiceErrorCodePattern $
     dcmStorePermissionCacheStaleTimeout $
     dcmStorePermissionCacheSize $
+    dcmStorePermissionServiceResponse $
     dcmMergeMWLCacheStaleTimeout $
     dcmMergeMWLCacheSize $
     dcmStoreUpdateDBMaxRetries $
@@ -1658,6 +1665,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.5 NAME 'dcmArchiveNetworkAE'
     dcmRetrieveAET $
     dcmReturnRetrieveAET $
     dcmDefaultCharacterSet $
+    dcmDefaultWorklistLabel $
     dcmStorageID $
     dcmObjectStorageID $
     dcmObjectStorageCount $
@@ -1710,6 +1718,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.5 NAME 'dcmArchiveNetworkAE'
     dcmStorePermissionServiceExpirationDatePattern $
     dcmStorePermissionServiceErrorCommentPattern $
     dcmStorePermissionServiceErrorCodePattern $
+    dcmStorePermissionServiceResponse $
     dcmAllowRejectionForDataRetentionPolicyExpired $
     dcmAcceptedUserRole $
     dcmAllowDeleteStudyPermanently $