From 67fdebf317a7546ec9859ea3609e60e4f701a585 Mon Sep 17 00:00:00 2001
From: drm <david.maffitt@wustl.edu>
Date: Fri, 16 Sep 2016 14:06:49 -0500
Subject: [PATCH] Edit default site-wide anon script for if-then-else op, add
dicomEdit logging to logs/anon.log
---
src/main/resources/META-INF/xnat/defaults/id.das | 2 +-
src/main/resources/log4j.properties | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/main/resources/META-INF/xnat/defaults/id.das b/src/main/resources/META-INF/xnat/defaults/id.das
index c21dac64..c00355fb 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 59527687..98ffd3f0 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
--
GitLab