[GoogleCloudPlatform#29] Modify storage commitment adapter to query o…

…nly on sop instance uid (temporarily)
red1408 · Aug 12, 2019 · f02ad54 · f02ad54
1 parent 77a2626
commit f02ad54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.../main/java/com/google/cloud/healthcare/imaging/dicomadapter/StorageCommitmentService.java b/.../main/java/com/google/cloud/healthcare/imaging/dicomadapter/StorageCommitmentService.java
@@ -149,8 +149,10 @@ public void run() {
  attrsItem.getString(Tag.ReferencedSOPClassUID));
  queryAttributes
  .setString(Tag.SOPInstanceUID, VR.UI, cmtItem.getInstanceUid());
- queryAttributes
- .setString(Tag.SOPClassUID, VR.UI, cmtItem.getClassUid());
+ // current (v1beta1) healthcare api wrongly returns
+ // "SOPClassUID is not a supported instance or study or series level attribute"
+ //queryAttributes
+ // .setString(Tag.SOPClassUID, VR.UI, cmtItem.getClassUid());
  queryAttributes.setString(Tag.QueryRetrieveLevel, VR.CS, "IMAGE");
  try {
  String qidoPath = AttributesUtil.attributesToQidoPath(queryAttributes);

diff --git a/integration_test/commitment-expected.xml b/integration_test/commitment-expected.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="FileMetaInformationVersion" tag="00020001" vr="OB"><InlineBinary>AAE=</InlineBinary></DicomAttribute><DicomAttribute keyword="MediaStorageSOPClassUID" tag="00020002" vr="UI"><Value number="1">1.2.840.10008.1.20.1</Value></DicomAttribute><DicomAttribute keyword="MediaStorageSOPInstanceUID" tag="00020003" vr="UI"><Value number="1">1.2.840.10008.1.20.1.1</Value></DicomAttribute><DicomAttribute keyword="TransferSyntaxUID" tag="00020010" vr="UI"><Value number="1">1.2.840.10008.1.2.1</Value></DicomAttribute><DicomAttribute keyword="ImplementationClassUID" tag="00020012" vr="UI"><Value number="1">1.2.40.0.13.1.3</Value></DicomAttribute><DicomAttribute keyword="ImplementationVersionName" tag="00020013" vr="SH"><Value number="1">dcm4che-5.15.1</Value></DicomAttribute><DicomAttribute keyword="RetrieveAETitle" tag="00080054" vr="AE"><Value number="1">IMPORTADAPTER</Value></DicomAttribute><DicomAttribute keyword="FailedSOPSequence" tag="00081198" vr="SQ"><Item number="1"><DicomAttribute keyword="ReferencedSOPClassUID" tag="00081150" vr="UI"><Value number="1">1.2.840.10008.5.1.4.1.1.7</Value></DicomAttribute><DicomAttribute keyword="ReferencedSOPInstanceUID" tag="00081155" vr="UI"><Value number="1">111</Value></DicomAttribute><DicomAttribute keyword="FailureReason" tag="00081197" vr="US"><Value number="1">272</Value></DicomAttribute></Item></DicomAttribute></NativeDicomModel>
+<?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="FileMetaInformationVersion" tag="00020001" vr="OB"><InlineBinary>AAE=</InlineBinary></DicomAttribute><DicomAttribute keyword="MediaStorageSOPClassUID" tag="00020002" vr="UI"><Value number="1">1.2.840.10008.1.20.1</Value></DicomAttribute><DicomAttribute keyword="MediaStorageSOPInstanceUID" tag="00020003" vr="UI"><Value number="1">1.2.840.10008.1.20.1.1</Value></DicomAttribute><DicomAttribute keyword="TransferSyntaxUID" tag="00020010" vr="UI"><Value number="1">1.2.840.10008.1.2.1</Value></DicomAttribute><DicomAttribute keyword="ImplementationClassUID" tag="00020012" vr="UI"><Value number="1">1.2.40.0.13.1.3</Value></DicomAttribute><DicomAttribute keyword="ImplementationVersionName" tag="00020013" vr="SH"><Value number="1">dcm4che-5.15.1</Value></DicomAttribute><DicomAttribute keyword="RetrieveAETitle" tag="00080054" vr="AE"><Value number="1">IMPORTADAPTER</Value></DicomAttribute><DicomAttribute keyword="ReferencedSOPSequence" tag="00081199" vr="SQ"><Item number="1"><DicomAttribute keyword="ReferencedSOPClassUID" tag="00081150" vr="UI"><Value number="1">1.2.840.10008.5.1.4.1.1.7</Value></DicomAttribute><DicomAttribute keyword="ReferencedSOPInstanceUID" tag="00081155" vr="UI"><Value number="1">111</Value></DicomAttribute></Item></DicomAttribute></NativeDicomModel>