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

…rameter 'includefield' #1690
dcm4che · Dec 5, 2018 · 8a808b7 · 8a808b7
1 parent ada6125
commit 8a808b7
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
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 December 5, 2018 11:58:18 AM
+# Generated by Apache Directory Studio on December 5, 2018 2:43:32 PM
 
 # SCHEMA "DCM4CHEE-ARCHIVE"
 dn: cn=dcm4chee-archive, ou=schema
@@ -2342,8 +2342,9 @@ objectclass: top
 m-oid: 1.2.40.0.13.1.15.110.3.177
 m-name: dcmAttributeSetType
 m-description: Specifies if this Attribute Set is used by Query Parameter "inclu
- defields" of QIDO-RS and WADO-RS or by Query Parameter "comparefield" of DIFF-R
- S requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.
+ defields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" 
+ of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIN
+ D_SCP.
 m-equality: caseExactIA5Match
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
 m-singleValue: TRUE
@@ -3846,8 +3847,9 @@ objectclass: metaTop
 objectclass: top
 m-oid: 1.2.40.0.13.1.15.110.4.29
 m-name: dcmAttributeSet
-m-description: Named Attribute Set for Query Parameter "comparefield" of DIFF-RS
-  and Query Parameter "includefields" of WADO-RS Metadata requests.
+m-description: Named Attribute Set for Query Parameter "includefields" of QIDO-R
+ S and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests
+ .
 m-supObjectClass: top
 m-must: dcmAttributeSetType
 m-must: dcmAttributeSetID

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
@@ -877,7 +877,7 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.176 NAME 'hl7NoPatientCreateMessageType
   SUBSTR caseExactSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 attributeTypes: ( 1.2.40.0.13.1.15.110.3.177 NAME 'dcmAttributeSetType'
-  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
+  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
@@ -1764,7 +1764,7 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.28 NAME 'hl7OrderSPSStatus'
     dcmSPSStatus $
     hl7OrderControlStatus ) )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.29 NAME 'dcmAttributeSet'
-  DESC 'Named Attribute Set for Query Parameter "comparefield" of DIFF-RS and Query Parameter "includefields" of WADO-RS Metadata requests.'
+  DESC 'Named Attribute Set for Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests.'
   SUP top STRUCTURAL
   MUST (
     dcmAttributeSetType $

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
@@ -1050,7 +1050,7 @@ attributetype ( 1.2.40.0.13.1.15.110.3.176 NAME 'hl7NoPatientCreateMessageType'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 attributetype ( 1.2.40.0.13.1.15.110.3.177 NAME 'dcmAttributeSetType'
-  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
+  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
@@ -2043,7 +2043,7 @@ objectclass ( 1.2.40.0.13.1.15.110.4.28 NAME 'hl7OrderSPSStatus'
     hl7OrderControlStatus ) )
 
 objectclass ( 1.2.40.0.13.1.15.110.4.29 NAME 'dcmAttributeSet'
-  DESC 'Named Attribute Set for Query Parameter "comparefield" of DIFF-RS and Query Parameter "includefields" of WADO-RS Metadata requests.'
+  DESC 'Named Attribute Set for Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests.'
   SUP top STRUCTURAL
   MUST (
     dcmAttributeSetType $

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
@@ -879,7 +879,7 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.176 NAME 'hl7NoPatientCreateMessageT
   SUBSTR caseExactSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.177 NAME 'dcmAttributeSetType'
-  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
+  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
@@ -1770,7 +1770,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.28 NAME 'hl7OrderSPSStatus'
     dcmSPSStatus $
     hl7OrderControlStatus ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.29 NAME 'dcmAttributeSet'
-  DESC 'Named Attribute Set for Query Parameter "comparefield" of DIFF-RS and Query Parameter "includefields" of WADO-RS Metadata requests.'
+  DESC 'Named Attribute Set for Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests.'
   SUP top STRUCTURAL
   MUST (
     dcmAttributeSetType $

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif
@@ -876,7 +876,7 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.176 NAME 'hl7NoPatientCreateMessageT
   SUBSTR caseExactSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.177 NAME 'dcmAttributeSetType'
-  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
+  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
@@ -1763,7 +1763,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.28 NAME 'hl7OrderSPSStatus'
     dcmSPSStatus $
     hl7OrderControlStatus ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.29 NAME 'dcmAttributeSet'
-  DESC 'Named Attribute Set for Query Parameter "comparefield" of DIFF-RS and Query Parameter "includefields" of WADO-RS Metadata requests.'
+  DESC 'Named Attribute Set for Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests.'
   SUP top STRUCTURAL
   MUST (
     dcmAttributeSetType $

diff --git a/dcm4chee-arc-ui2/src/assets/schema/archiveDevice.schema.json b/dcm4chee-arc-ui2/src/assets/schema/archiveDevice.schema.json
@@ -1128,7 +1128,7 @@
     },
     "dcmAttributeSet": {
       "title": "Attribute Set",
-      "description": "Named Attribute Set for Query Parameter 'comparefield' of DIFF-RS and Query Parameter 'includefields' of WADO-RS Metadata requests.",
+      "description": "Named Attribute Set for Query Parameter 'includefields' of QIDO-RS and WADO-RS Metadata or by Query Parameter 'comparefield' of DIFF-RS requests.",
       "type": "array",
       "titleKey":"{dcmAttributeSetType}:{dcmAttributeSetID}",
       "items" : {

diff --git a/dcm4chee-arc-ui2/src/assets/schema/attributeSet.schema.json b/dcm4chee-arc-ui2/src/assets/schema/attributeSet.schema.json
@@ -1,6 +1,6 @@
 {
   "title": "Attribute Set",
-  "description": "Named Attribute Set for Query Parameter 'comparefield' of DIFF-RS and Query Parameter 'includefields' of WADO-RS Metadata requests.",
+  "description": "Named Attribute Set for Query Parameter 'includefields' of QIDO-RS and WADO-RS Metadata or by Query Parameter 'comparefield' of DIFF-RS requests.",
   "type": "object",
   "required": [
     "dcmAttributeSetType",
@@ -16,7 +16,7 @@
     },
     "dcmAttributeSetType": {
       "title": "Attribute Set Type",
-      "description": "Specifies if this Attribute Set is used by Query Parameter 'includefields' of QIDO-RS and WADO-RS or by Query Parameter 'comparefield' of DIFF-RS requests.",
+      "description": "Specifies if this Attribute Set is used by Query Parameter 'includefields' of QIDO-RS and WADO-RS Metadata or by Query Parameter 'comparefield' of DIFF-RS requests.",
       "type": "string",
       "enum": [
         "QIDO_RS",