[dcm4che-commits] CVS: dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp QueryRetrieveScpService.java,1.30,1.31 MoveTask.java,1.31,1.32 RetrieveInfo.java,1.3,1.4

[gunter z. <gun...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32509/src/java/org/dcm4chex/archive/dcm/qrscp

Modified Files:
	QueryRetrieveScpService.java MoveTask.java RetrieveInfo.java 
Log Message:
add QueryRetrieve.SendDecompressedToAETitles

Index: QueryRetrieveScpService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/QueryRetrieveScpService.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** QueryRetrieveScpService.java	29 Nov 2005 14:43:55 -0000	1.30
--- QueryRetrieveScpService.java	25 Jan 2006 22:45:11 -0000	1.31
***************
*** 119,122 ****
--- 119,124 ----
      private String[] sendNoPixelDataToAETs = null;
      
+     private String[] sendDecompressedToAETs = null;
+ 
      private String[] ignoreUnsupportedSOPClassFailuresByAETs = null;
      
***************
*** 425,429 ****
  	public final String getSendNoPixelDataToAETs() {
          return sendNoPixelDataToAETs == null ? NONE
!                 : StringUtils.toString(callingAETs, '\\');
      }
  
--- 427,431 ----
  	public final String getSendNoPixelDataToAETs() {
          return sendNoPixelDataToAETs == null ? NONE
!                 : StringUtils.toString(sendNoPixelDataToAETs, '\\');
      }
  
***************
*** 433,436 ****
--- 435,448 ----
      }
      
+     public final String getSendDecompressedToAETs() {
+         return sendDecompressedToAETs == null ? NONE
+                 : StringUtils.toString(sendDecompressedToAETs, '\\');
+     }
+ 
+     public final void setSendDecompressedToAETs(String aets) {
+         this.sendDecompressedToAETs = NONE.equalsIgnoreCase(aets) ? null 
+                 : StringUtils.split(aets, '\\');
+     }
+     
      public final String getIgnoreUnsupportedSOPClassFailuresByAETs() {
          return ignoreUnsupportedSOPClassFailuresByAETs == null ? NONE
***************
*** 630,633 ****
--- 642,650 ----
      }
      
+     boolean isDecompressed(String moveDest) {
+         return sendDecompressedToAETs != null
+             && Arrays.asList(sendDecompressedToAETs).contains(moveDest);
+     }
+     
      boolean isIgnoreUnsupportedSOPClassFailures(String moveDest) {
          return ignoreUnsupportedSOPClassFailuresByAETs != null

Index: MoveTask.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/MoveTask.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** MoveTask.java	26 Dec 2005 23:47:27 -0000	1.31
--- MoveTask.java	25 Jan 2006 22:45:11 -0000	1.32
***************
*** 217,221 ****
              rq.setCalledAET(moveDest);
              rq.setCallingAET(moveAssoc.getAssociation().getCalledAET());
!             retrieveInfo.addPresContext(rq);
              ac = a.connect(rq);
          } catch (IOException e) {
--- 217,221 ----
              rq.setCalledAET(moveDest);
              rq.setCallingAET(moveAssoc.getAssociation().getCalledAET());
!             retrieveInfo.addPresContext(rq, service.isDecompressed(moveDest));
              ac = a.connect(rq);
          } catch (IOException e) {

Index: RetrieveInfo.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/RetrieveInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RetrieveInfo.java	14 Nov 2005 12:36:36 -0000	1.3
--- RetrieveInfo.java	25 Jan 2006 22:45:11 -0000	1.4
***************
*** 95,99 ****
          String iuid, cuid;
          IuidsAndTsuids iuidsAndTsuids;
-         List localFiles;
          this.size = instInfos.length;
          for (int i = 0; i < size; ++i) {
--- 95,98 ----
***************
*** 169,173 ****
      }
     
!     public void addPresContext(AAssociateRQ rq) {
          String cuid;
          String tsuid;
--- 168,172 ----
      }
     
!     public void addPresContext(AAssociateRQ rq, boolean sendDecompressed) {
          String cuid;
          String tsuid;
***************
*** 180,184 ****
              iuidsAndTsuids = (IuidsAndTsuids) entry.getValue();
              rq.addPresContext(asf.newPresContext(rq.nextPCID(), cuid, 
!                     NATIVE_LE_TS)); 
              Iterator it2 = iuidsAndTsuids.tsuids.iterator();
              while (it2.hasNext()) {
--- 179,185 ----
              iuidsAndTsuids = (IuidsAndTsuids) entry.getValue();
              rq.addPresContext(asf.newPresContext(rq.nextPCID(), cuid, 
!                     NATIVE_LE_TS));
!             if (sendDecompressed)
!                 continue;
              Iterator it2 = iuidsAndTsuids.tsuids.iterator();
              while (it2.hasNext()) {