Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

10th temp commitment instanceuid only #30

Merged
merged 3 commits into from
Aug 12, 2019
Merged

10th temp commitment instanceuid only #30

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f38a11
[#29] Modify storage commitment adapter to query only on sop instance…
red1408 Aug 12, 2019
b83c0c4
[#28] remove lines instead of commenting
red1408 Aug 12, 2019
f944295
Merge branch 'official-master' into 10th_temp_commitment_instanceuid_…
red1408 Aug 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .../main/java/com/google/cloud/healthcare/imaging/dicomadapter/StorageCommitmentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer deleting the code for now, and we can use commit history to add it back once the issue is resolved on the server side.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

// .setString(Tag.SOPClassUID, VR.UI, cmtItem.getClassUid());
queryAttributes.setString(Tag.QueryRetrieveLevel, VR.CS, "IMAGE");
try {
String qidoPath = AttributesUtil.attributesToQidoPath(queryAttributes);
Expand Down
2 changes: 1 addition & 1 deletion integration_test/commitment-expected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>