Optionally add missing Specific Character Set (0008,0005) in received…

… patient attributes by PDQ Service using DICOM Patient Root Query C-FIND Service #1711

dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive-ui.ldif

@@ -1,4 +1,4 @@
-# Generated by Apache Directory Studio on September 6, 2018 8:54:54 AM
+# Generated by Apache Directory Studio on November 30, 2018 12:45:13 PM
 
 # SCHEMA "DCM4CHEE-ARCHIVE-UI"
 dn: cn=dcm4chee-archive-ui, ou=schema
@@ -639,6 +639,76 @@ 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.111.3.53, ou=attributetypes, cn=dcm4chee-archive-ui, 
+ ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.111.3.53
+m-name: dcmuiAetListName
+m-description: Aet List Name
+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.111.3.54, ou=attributetypes, cn=dcm4chee-archive-ui, 
+ ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.111.3.54
+m-name: dcmuiAetListDescription
+m-description: Aet List Description
+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.111.3.55, ou=attributetypes, cn=dcm4chee-archive-ui, 
+ ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.111.3.55
+m-name: dcmuiMode
+m-description: Aet List Mode internal or external
+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.111.3.56, ou=attributetypes, cn=dcm4chee-archive-ui, 
+ ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.111.3.56
+m-name: dcmuiAets
+m-description: Aet Selected List
+m-equality: caseExactIA5Match
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+
+dn: m-oid=1.2.40.0.13.1.15.111.3.57, ou=attributetypes, cn=dcm4chee-archive-ui, 
+ ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.111.3.57
+m-name: dicomuiDockerContainer
+m-description: Names of the archive docker containers used in the hardware page
+m-equality: caseExactIA5Match
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+
+dn: m-oid=1.2.40.0.13.1.15.111.3.58, ou=attributetypes, cn=dcm4chee-archive-ui, 
+ ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.111.3.58
+m-name: dcmuiShowStarBlock
+m-description: Show Star Block - tasks without defined deviceName
+m-equality: booleanMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+m-singleValue: TRUE
+
 dn: ou=comparators, cn=dcm4chee-archive-ui, ou=schema
 objectclass: organizationalUnit
 objectclass: top
@@ -723,6 +793,21 @@ m-may: dcmuiFilterTemplateUsername
 m-may: dcmuiFilterTemplateRole
 m-may: dcmuiFilterTemplateDefault
 
+dn: m-oid=1.2.40.0.13.1.15.111.4.12, ou=objectclasses, cn=dcm4chee-archive-ui, o
+ u=schema
+objectclass: metaObjectClass
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.111.4.12
+m-name: dcmuiAetConfig
+m-description: Filter template
+m-supObjectClass: top
+m-must: dcmuiAetListName
+m-must: dcmuiAets
+m-may: dcmuiAetListDescription
+m-may: dcmuiMode
+m-may: dcmAcceptedUserRole
+
 dn: m-oid=1.2.40.0.13.1.15.111.4.2, ou=objectclasses, cn=dcm4chee-archive-ui, ou
  =schema
 objectclass: metaObjectClass
@@ -784,9 +869,11 @@ m-supObjectClass: top
 m-must: dcmuiDashboardConfigName
 m-may: dcmuiQueueName
 m-may: dcmuiExportName
+m-may: dcmuiShowStarBlock
 m-may: dcmuiCountAET
 m-may: dicomuiDeviceName
 m-may: dicomuiIgnoreParams
+m-may: dicomuiDockerContainer
 m-may: dcmuiCompareSideName
 
 dn: m-oid=1.2.40.0.13.1.15.111.4.6, ou=objectclasses, cn=dcm4chee-archive-ui, ou

dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif

@@ -1,4 +1,4 @@
-# Generated by Apache Directory Studio on November 29, 2018 12:45:43 PM
+# Generated by Apache Directory Studio on November 30, 2018 12:44:41 PM
 
 # SCHEMA "DCM4CHEE-ARCHIVE"
 dn: cn=dcm4chee-archive, ou=schema
@@ -3942,6 +3942,7 @@ m-must: dcmPDQServiceID
 m-must: dcmURI
 m-may: dicomDescription
 m-may: dcmTag
+m-may: dcmDefaultCharacterSet
 m-may: dcmProperty
 
 dn: m-oid=1.2.40.0.13.1.15.110.4.35, ou=objectclasses, cn=dcm4chee-archive, ou=s

dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif

@@ -1835,6 +1835,7 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.34 NAME 'dcmPDQService'
   MAY (
     dicomDescription $
     dcmTag $
+    dcmDefaultCharacterSet $
     dcmProperty ) )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.35 NAME 'hl7PrefetchRule'
   DESC 'HL7 Prefetch Rule'

dcm4chee-arc-assembly/src/main/resources/ldap/opendj/13-dcm4chee-archive-ui.ldif

@@ -260,6 +260,34 @@ attributeTypes: ( 1.2.40.0.13.1.15.111.3.52 NAME 'dcmuiElasticsearchURLKeycloakS
   EQUALITY caseExactMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.111.3.53 NAME 'dcmuiAetListName'
+  DESC 'Aet List Name'
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.111.3.54 NAME 'dcmuiAetListDescription'
+  DESC 'Aet List Description'
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.111.3.55 NAME 'dcmuiMode'
+  DESC 'Aet List Mode internal or external'
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.111.3.56 NAME 'dcmuiAets'
+  DESC 'Aet Selected List'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
+attributeTypes: ( 1.2.40.0.13.1.15.111.3.57 NAME 'dicomuiDockerContainer'
+  DESC 'Names of the archive docker containers used in the hardware page'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+attributeTypes: ( 1.2.40.0.13.1.15.111.3.58 NAME 'dcmuiShowStarBlock'
+  DESC 'Show Star Block - tasks without defined deviceName'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
 objectClasses: ( 1.2.40.0.13.1.15.111.4.1 NAME 'dcmuiConfig'
   DESC 'Archive UI Configuration'
   SUP top STRUCTURAL
@@ -307,9 +335,11 @@ objectClasses: ( 1.2.40.0.13.1.15.111.4.5 NAME 'dcmuiDashboardConfig'
   MAY (
     dcmuiQueueName $
     dcmuiExportName $
+    dcmuiShowStarBlock $
     dcmuiCountAET $
     dicomuiDeviceName $
     dicomuiIgnoreParams $
+    dicomuiDockerContainer $
     dcmuiCompareSideName ) )
 objectClasses: ( 1.2.40.0.13.1.15.111.4.6 NAME 'dcmuiElasticsearchConfig'
   DESC 'UI Configuration for Elasticsearch'
@@ -371,3 +401,13 @@ objectClasses: ( 1.2.40.0.13.1.15.111.4.11 NAME 'dcmuiFilterTemplateObject'
     dcmuiFilterTemplateUsername $
     dcmuiFilterTemplateRole $
     dcmuiFilterTemplateDefault ) )
+objectClasses: ( 1.2.40.0.13.1.15.111.4.12 NAME 'dcmuiAetConfig'
+  DESC 'Filter template'
+  SUP top STRUCTURAL
+  MUST (
+    dcmuiAetListName $
+    dcmuiAets )
+  MAY (
+    dcmuiAetListDescription $
+    dcmuiMode $
+    dcmAcceptedUserRole ) )

dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema

@@ -2119,6 +2119,7 @@ objectclass ( 1.2.40.0.13.1.15.110.4.34 NAME 'dcmPDQService'
   MAY (
     dicomDescription $
     dcmTag $
+    dcmDefaultCharacterSet $
     dcmProperty ) )
 
 objectclass ( 1.2.40.0.13.1.15.110.4.35 NAME 'hl7PrefetchRule'

dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif

@@ -1841,6 +1841,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.34 NAME 'dcmPDQService'
   MAY (
     dicomDescription $
     dcmTag $
+    dcmDefaultCharacterSet $
     dcmProperty ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.35 NAME 'hl7PrefetchRule'
   DESC 'HL7 Prefetch Rule'

dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif

@@ -1834,6 +1834,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.34 NAME 'dcmPDQService'
   MAY (
     dicomDescription $
     dcmTag $
+    dcmDefaultCharacterSet $
     dcmProperty ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.35 NAME 'hl7PrefetchRule'
   DESC 'HL7 Prefetch Rule'

dcm4chee-arc-ui2/src/assets/schema/pdqService.schema.json

@@ -31,6 +31,12 @@
       },
       "format": "dcmTag"
     },
+    "dcmDefaultCharacterSet": {
+      "title": "Default Character Set",
+      "description": "Value of Specific Character Set (0008,0005) added to Data Sets without Specific Character Set (0008,0005) attribute received from the DICOM Patient Root Query C-FIND SCP. Only effective for DICOM PDQ Services (URI: pdq-dicom:{AETitle})",
+      "type": "string",
+      "format": "dcmCharset"
+    },
     "dcmProperty": {
       "title": "PDQ Service Property",
       "description": "Property in format <name>=<value>, e.g. 'LocalAET=DCM4CHEE'",