[dcm4che-commits] CVS: dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp StoreScp.java, 1.89, 1.90

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

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

Modified Files:
	StoreScp.java 
Log Message:
FIX Storage of MetaData with TianiURIReferenced Transfer Synatx (overwrote referenced file!)

Index: StoreScp.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** StoreScp.java	16 Mar 2007 10:54:26 -0000	1.89
--- StoreScp.java	27 Mar 2007 14:29:07 -0000	1.90
***************
*** 574,595 ****
                          baseDir.getPath().length() + 1).replace(
                          File.separatorChar, '/');
              }
-             String compressTSUID = (parser.getReadTag() == Tags.PixelData && parser
-                     .getReadLength() != -1) ? compressionRules
-                     .getTransferSyntaxFor(assoc, ds) : null;
-             String tsuid = (compressTSUID != null) ? compressTSUID : rq
-                     .getTransferSyntaxUID();
-             ds.setFileMetaInfo(objFact.newFileMetaInfo(rqCmd
-                     .getAffectedSOPClassUID(), rqCmd
-                     .getAffectedSOPInstanceUID(), tsuid));
- 
-             perfMon.start(activeAssoc, rq,
-                     PerfCounterEnum.C_STORE_SCP_OBJ_STORE);
-             perfMon.setProperty(activeAssoc, rq, PerfPropertyEnum.DICOM_FILE,
-                     file);
-             md5sum = storeToFile(parser, ds, file, getByteBuffer(assoc));
-             perfMon
-                     .stop(activeAssoc, rq,
-                             PerfCounterEnum.C_STORE_SCP_OBJ_STORE);
              if (md5sum != null && ignoreDuplicate(duplicates, md5sum)) {
                  log.info("Received Instance[uid=" + iuid
--- 574,595 ----
                          baseDir.getPath().length() + 1).replace(
                          File.separatorChar, '/');
+                 String compressTSUID = (parser.getReadTag() == Tags.PixelData && parser
+                         .getReadLength() != -1) ? compressionRules
+                         .getTransferSyntaxFor(assoc, ds) : null;
+                 String tsuid = (compressTSUID != null) ? compressTSUID : rq
+                         .getTransferSyntaxUID();
+                 ds.setFileMetaInfo(objFact.newFileMetaInfo(rqCmd
+                         .getAffectedSOPClassUID(), rqCmd
+                         .getAffectedSOPInstanceUID(), tsuid));
+     
+                 perfMon.start(activeAssoc, rq,
+                         PerfCounterEnum.C_STORE_SCP_OBJ_STORE);
+                 perfMon.setProperty(activeAssoc, rq, PerfPropertyEnum.DICOM_FILE,
+                         file);
+                 md5sum = storeToFile(parser, ds, file, getByteBuffer(assoc));
+                 perfMon
+                         .stop(activeAssoc, rq,
+                                 PerfCounterEnum.C_STORE_SCP_OBJ_STORE);
              }
              if (md5sum != null && ignoreDuplicate(duplicates, md5sum)) {
                  log.info("Received Instance[uid=" + iuid