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

[<jus...@us...>]

Revision: 6258
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=6258&view=rev
Author:   justinfalk
Date:     2008-04-29 15:41:49 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
DCMEE-819 - Added a flag to force the use of the CalledAET configured in the MoveSCU even if the move order specifies a Retrieve AET.

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-04-29 12:38:48 UTC (rev 6257)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-movescu-xmbean.xml	2008-04-29 22:41:49 UTC (rev 6258)
@@ -36,7 +36,8 @@
       getMethod="getCalledAET"
       setMethod="setCalledAET">
       <description>AE title of the default Move SCP. Only effective, if a
-      Move order does not specify a Retrieve AE title.
+      Move order does not specify a Retrieve AE title or the ForceCalledAET
+      flag is set to true.
       </description>
       <name>CalledAETitle</name>
       <type>java.lang.String</type>
@@ -45,6 +46,19 @@
       </descriptors>
    </attribute>
    <attribute access="read-write"
+      getMethod="isForceCalledAET"
+      setMethod="setForceCalledAET">
+      <description><![CDATA[Specifies whether to ALWAYS use the Called AET 
+      defined in the Move SCU.  If false, the Retrieve AET of the move 
+      order, if specified, will be used.]]>
+      </description>
+      <name>ForceCalledAET</name>
+      <type>boolean</type>
+      <descriptors>
+         <value value="false"/>
+      </descriptors>
+   </attribute>
+   <attribute access="read-write"
       getMethod="getRetryIntervalls"
       setMethod="setRetryIntervalls">
       <description><![CDATA[Number and interval of retries made for

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-04-29 12:38:48 UTC (rev 6257)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/movescu/MoveScuService.java	2008-04-29 22:41:49 UTC (rev 6258)
@@ -82,6 +82,8 @@
     private int concurrency = 1;
 
     private String queueName;
+    
+    private boolean forceCalledAET;
 
     private JMSDelegate jmsDelegate = new JMSDelegate(this);
 
@@ -167,6 +169,14 @@
         }
     }
 
+    public boolean isForceCalledAET() {
+        return forceCalledAET;
+    }
+
+    public void setForceCalledAET(boolean forceCalledAET) {
+        this.forceCalledAET = forceCalledAET;
+    }
+
     public void scheduleMove(String retrieveAET, String destAET,
             int priority, String pid, String studyIUID, String seriesIUID,
             String[] sopIUIDs, long scheduledTime) {
@@ -229,9 +239,10 @@
 
     private void process(MoveOrder order) throws Exception {
         String aet = order.getRetrieveAET();
-        if (aet == null) {
+        if (forceCalledAET || aet == null) {
             aet = calledAET;
         }
+        
         ActiveAssociation aa = openAssociation(aet,
                 UIDs.PatientRootQueryRetrieveInformationModelMOVE);
         


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