Skip to content

Commit

Permalink
adding additional parameters, UI: Configuration: adding UI Elasticsea…
Browse files Browse the repository at this point in the history 
…rch config dcm4che/dcm4chee-arc-light#1374

Require to configure unconstraint deletion of Studies explicitly dcm4che/dcm4chee-arc-light#1380
  • Loading branch information
@gunterze
gunterze committed May 9, 2018
1 parent 7cda7ab commit 2f36730
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 22 deletions.
6 changes: 6 additions & 0 deletions ldap/schema/dcm4chee-archive-modify.ldif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,11 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.208 NAME 'dcmExportStorageID'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.209 NAME 'dcmNoDeletionConstraint'
DESC 'If no External Retrieve AET or Export Storage ID is configured on Storage Descriptor and deleter threshold is reached, by default studies will not be deleted. Default is false.'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
-
delete: olcObjectClasses
-
Expand Down Expand Up @@ -1276,6 +1281,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.12 NAME 'dcmStorage'
dcmDeleterThreshold $
dcmExternalRetrieveAET $
dcmExportStorageID $
dcmNoDeletionConstraint $
dcmReadOnly $
dcmProperty ) )
olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.13 NAME 'dcmQueryRetrieveView'
Expand Down
35 changes: 24 additions & 11 deletions ldap/schema/dcm4chee-archive-ui-modify.ldif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,29 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.21 NAME 'dcmuiCountAET'
SINGLE-VALUE )
olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.22 NAME 'dcmuiElasticsearchConfigName'
DESC 'Name of Elasticsearch UI Configuration'
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.111.3.23 NAME 'dcmuiElasticsearchURLName'
DESC 'Elasticsearch URL Name'
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.111.3.24 NAME 'dcmuiElasticsearchURL'
DESC 'Elasticsearch URL'
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.111.3.25 NAME 'dcmuiElasticsearchIsDefault'
DESC 'Indicates if the URL is the default one'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.26 NAME 'dcmuiElasticsearchInstalled'
DESC 'Indicates if the URL is installed'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
-
delete: olcObjectClasses
-
Expand Down Expand Up @@ -181,12 +191,15 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.6 NAME 'dcmuiElasticsearchConfig'
DESC 'UI Configuration for Elasticsearch'
SUP top STRUCTURAL
MUST (
dcmuiElasticsearchConfigName )
dcmuiElasticsearchConfigName )
MAY (
dcmuiElasticsearchURL ) )
olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.7 NAME 'dcmuiElasticsearchURLObject'
dcmuiElasticsearchURL ) )
olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.7 NAME 'dcmuiElasticsearchURLObjects'
DESC 'Elasticsearch URL'
SUP top STRUCTURAL
MUST (
dcmuiElasticsearchURLName $
dcmuiElasticsearchURL ) )
dcmuiElasticsearchURLName $
dcmuiElasticsearchURL )
MAY (
dcmuiElasticsearchIsDefault $
dcmuiElasticsearchInstalled) )
35 changes: 24 additions & 11 deletions ldap/schema/dcm4chee-archive-ui.ldif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,29 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.21 NAME 'dcmuiCountAET'
SINGLE-VALUE )
olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.22 NAME 'dcmuiElasticsearchConfigName'
DESC 'Name of Elasticsearch UI Configuration'
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.111.3.23 NAME 'dcmuiElasticsearchURLName'
DESC 'Elasticsearch URL Name'
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.111.3.24 NAME 'dcmuiElasticsearchURL'
DESC 'Elasticsearch URL'
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.111.3.25 NAME 'dcmuiElasticsearchIsDefault'
DESC 'Indicates if the URL is the default one'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.26 NAME 'dcmuiElasticsearchInstalled'
DESC 'Indicates if the URL is installed'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.1 NAME 'dcmuiConfig'
DESC 'Archive UI Configuration'
SUP top STRUCTURAL
Expand Down Expand Up @@ -174,12 +184,15 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.6 NAME 'dcmuiElasticsearchConfig'
DESC 'UI Configuration for Elasticsearch'
SUP top STRUCTURAL
MUST (
dcmuiElasticsearchConfigName )
dcmuiElasticsearchConfigName )
MAY (
dcmuiElasticsearchURL ) )
olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.7 NAME 'dcmuiElasticsearchURLObject'
dcmuiElasticsearchURL ) )
olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.7 NAME 'dcmuiElasticsearchURLObjects'
DESC 'Elasticsearch URL'
SUP top STRUCTURAL
MUST (
dcmuiElasticsearchURLName $
dcmuiElasticsearchURL ) )
dcmuiElasticsearchURLName $
dcmuiElasticsearchURL )
MAY (
dcmuiElasticsearchIsDefault $
dcmuiElasticsearchInstalled) )
6 changes: 6 additions & 0 deletions ldap/schema/dcm4chee-archive.ldif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,11 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.208 NAME 'dcmExportStorageID'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.209 NAME 'dcmNoDeletionConstraint'
DESC 'If no External Retrieve AET or Export Storage ID is configured on Storage Descriptor and deleter threshold is reached, by default studies will not be deleted. Default is false.'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
DESC 'DICOM Archive Device related information'
SUP top AUXILIARY
Expand Down Expand Up @@ -1269,6 +1274,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.12 NAME 'dcmStorage'
dcmDeleterThreshold $
dcmExternalRetrieveAET $
dcmExportStorageID $
dcmNoDeletionConstraint $
dcmReadOnly $
dcmProperty ) )
olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.13 NAME 'dcmQueryRetrieveView'
Expand Down

0 comments on commit 2f36730

Please sign in to comment.