diff --git a/src/main/resources/META-INF/xnat/defaults/id.das b/src/main/resources/META-INF/xnat/defaults/id.das index c21dac6409faa4a7490bdb0927613cb0b4ce1db3..c00355fb0ae97c15ef96c9136fdfda37fc138c22 100644 --- a/src/main/resources/META-INF/xnat/defaults/id.das +++ b/src/main/resources/META-INF/xnat/defaults/id.das @@ -6,6 +6,6 @@ // // Released under the Simplified BSD. // -project != "Unassigned" : (0008,1030) := project +project != "Unassigned" ? (0008,1030) := project (0010,0010) := subject (0010,0020) := session diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 59527687bdb07ece70ccbb939fd83d33078b00a7..98ffd3f099857cbb0f72af683a6004a83713259a 100644 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -149,6 +149,10 @@ log4j.additivity.org.nrg.xdat.preferences=false log4j.category.org.nrg.dcm=WARN, dicom log4j.additivity.org.nrg.dcm=false +# Anon services (DicomEdit) +log4j.category.org.nrg.dcm.edit=WARN, anon +log4j.additivity.org.nrg.dcm.edit=false + # # Automation logging # @@ -421,3 +425,14 @@ log4j.appender.jms.File=${xnat.home}/logs/jms.log log4j.appender.jms.DatePattern='.'yyyy-MM-dd log4j.appender.jms.layout=org.apache.log4j.PatternLayout log4j.appender.jms.layout.ConversionPattern=%d %m%n + +# +# DicomEdit logging +# +#log4j.category.org.nrg.dcm.edit=INFO, anon +#log4j.additivity.org.nrg.dcm.edit=false +log4j.appender.anon=org.apache.log4j.DailyRollingFileAppender +log4j.appender.anon.File=${xnat.home}/logs/anon.log +log4j.appender.anon.DatePattern='.'yyyy-MM-dd +log4j.appender.anon.layout=org.apache.log4j.PatternLayout +log4j.appender.anon.layout.ConversionPattern=%d %m%n