[dcm4che-commits] SF.net SVN: dcm4che: [6071] dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src

[<jav...@us...>]

Revision: 6071
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=6071&view=rev
Author:   javawilli
Date:     2008-02-21 07:07:53 -0800 (Thu, 21 Feb 2008)

Log Message:
-----------
[#DCMEE-768] Set retry interval in MoveScu to NEVER failed.

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-movescu-xmbean.xml
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/MoveScuService.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-movescu-xmbean.xml
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-movescu-xmbean.xml	2008-02-20 15:21:57 UTC (rev 6070)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-movescu-xmbean.xml	2008-02-21 15:07:53 UTC (rev 6071)
@@ -50,15 +50,27 @@
       <description><![CDATA[Number and interval of retries made for
       failed Move Requests.
       <br>Format:
-      <br>Comma separated list of <i>number</i>x<i>interval</i> pairs.
+      <br>Comma separated list of <i>number</i>x<i>interval</i> pairs or NEVER to disable retry for any destinations.
       <br>The interval can be specified in seconds (##s),
       minutes (##m), hours (##h) or days (##d).
-      <br>Optional: Individual settings for specific Destination AETs. e.g. [AET1]3x1m,5x1h
-      <br>Several AET settings can be seperated with new line or ';'.
-      <br>Example: 
-      <br>5x1m,10x10m means retry a total of 5 times, one minute
+      <br/>Optional: Individual settings for specific Destination AETs. e.g. [AET1]3x1m,5x1h
+      <br/>Several AET settings can be seperated with new line or ';'. 
+      A entry without AET will be treated as default for AETs not listed here.
+      <br/>Example: 
+      <br/>5x1m,10x10m means retry a total of 5 times, one minute
       apart for each retry; then retry a total of 10 times, 10 minutes 
-      apart for each retry.]]>
+      <br/>Example: 
+      <br/>[AET1]2x1m,3x10m 
+      <br/>[AET2] 
+      <br/>5x1m,10x10m 
+      <br/>means: for destination AET1 retry a total of 2 times, one minute
+      apart for each retry; then retry a total of 3 times, 10 minutes 
+      apart for each retry.
+      <br/>Retries are disabled for destination AET2!
+      <br/>for all other destinations retry a total of 5 times, one minute
+      apart for each retry; then retry a total of 10 times, 10 minutes 
+      apart for each retry.
+      ]]>
       </description>
       <name>RetryIntervals</name>
       <type>java.lang.String</type>

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/MoveScuService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/MoveScuService.java	2008-02-20 15:21:57 UTC (rev 6070)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/MoveScuService.java	2008-02-21 15:07:53 UTC (rev 6071)
@@ -151,6 +151,7 @@
 
     public void setRetryIntervalls(String text) {
         retryIntervalls.clear();
+        if ( "NEVER".equals(text)) return;
         StringTokenizer st = new StringTokenizer(text,";\r\n");
         String token, key;
         int pos;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.