Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che: [6170] dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src
|
From: <gun...@us...> - 2008-04-03 10:47:45
|
Revision: 6170
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=6170&view=rev
Author: gunterze
Date: 2008-04-03 03:47:42 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
[#DCMEE-803] Forward objects received from configurable list of Storage SCUs on Instance Level instead on Series Level
Modified Paths:
--------------
dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-forward-xmbean.xml
dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-forward2-xmbean.xml
dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/ForwardService.java
dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/ForwardService2.java
Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-forward-xmbean.xml
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-forward-xmbean.xml 2008-04-03 10:35:34 UTC (rev 6169)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-forward-xmbean.xml 2008-04-03 10:47:42 UTC (rev 6170)
@@ -58,6 +58,7 @@
Objects received from other Storage SCUs are forwarded on Series level,
which may cause to multiple forwarding of objects, if the Storage SCU
sends instances of one Series association.
+ <br>ALL = Forward objects on Instance level received from any Storage SCUs.
<br>NONE = Forward objects on Series level received from any Storage SCUs.
<br>Exception: if only one object is received in the association,
the object will be forwarded by an Instance level retrieve request, even
Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-forward2-xmbean.xml
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-forward2-xmbean.xml 2008-04-03 10:35:34 UTC (rev 6169)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-forward2-xmbean.xml 2008-04-03 10:47:42 UTC (rev 6170)
@@ -47,6 +47,7 @@
Objects received from other Storage SCUs are forwarded on Series level,
which may cause to multiple forwarding of objects, if the Storage SCU
sends instances of one Series association.
+ <br>ALL = Forward objects on Instance level received from any Storage SCUs.
<br>NONE = Forward objects on Series level received from any Storage SCUs.
<br>Exception: if only one object is received in the association,
the object will be forwarded by an Instance level retrieve request, even
Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/ForwardService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/ForwardService.java 2008-04-03 10:35:34 UTC (rev 6169)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/ForwardService.java 2008-04-03 10:47:42 UTC (rev 6170)
@@ -133,6 +133,8 @@
}
};
+ private static final String ALL = "ALL";
+
private static final String NONE = "NONE";
private static final String[] EMPTY = {};
@@ -191,16 +193,20 @@
}
public String getForwardOnInstanceLevelFromAETs() {
- return forwardOnInstanceLevelFromAETs.length == 0 ? NONE
+ return forwardOnInstanceLevelFromAETs == null ? ALL
+ : forwardOnInstanceLevelFromAETs.length == 0 ? NONE
: StringUtils.toString(forwardOnInstanceLevelFromAETs, ',');
}
public void setForwardOnInstanceLevelFromAETs(String s) {
- forwardOnInstanceLevelFromAETs = NONE.equals(s) ? EMPTY
- : StringUtils.split(s, ',');
+ forwardOnInstanceLevelFromAETs = ALL.equals(s) ? null
+ : NONE.equals(s) ? EMPTY : StringUtils.split(s, ',');
}
private boolean isForwardOnInstanceLevelFromAET(String aet) {
+ if (forwardOnInstanceLevelFromAETs == null) {
+ return true;
+ }
for (int i = 0; i < forwardOnInstanceLevelFromAETs.length; i++) {
if (aet.equals(forwardOnInstanceLevelFromAETs[i]))
return true;
Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/ForwardService2.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/ForwardService2.java 2008-04-03 10:35:34 UTC (rev 6169)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/ForwardService2.java 2008-04-03 10:47:42 UTC (rev 6170)
@@ -76,6 +76,8 @@
private static final String FORWARD_XSL = "forward.xsl";
+ private static final String ALL = "ALL";
+
private static final String NONE = "NONE";
private static final String[] EMPTY = {};
@@ -127,16 +129,20 @@
}
public String getForwardOnInstanceLevelFromAETs() {
- return forwardOnInstanceLevelFromAETs.length == 0 ? NONE
+ return forwardOnInstanceLevelFromAETs == null ? ALL
+ : forwardOnInstanceLevelFromAETs.length == 0 ? NONE
: StringUtils.toString(forwardOnInstanceLevelFromAETs, ',');
}
public void setForwardOnInstanceLevelFromAETs(String s) {
- forwardOnInstanceLevelFromAETs = NONE.equals(s) ? EMPTY
- : StringUtils.split(s, ',');
+ forwardOnInstanceLevelFromAETs = ALL.equals(s) ? null
+ : NONE.equals(s) ? EMPTY : StringUtils.split(s, ',');
}
private boolean isForwardOnInstanceLevelFromAET(String aet) {
+ if (forwardOnInstanceLevelFromAETs == null) {
+ return true;
+ }
for (int i = 0; i < forwardOnInstanceLevelFromAETs.length; i++) {
if (aet.equals(forwardOnInstanceLevelFromAETs[i]))
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
