Mercurial > hg > orthanc

comparison OrthancServer/UnitTestsSources/ServerIndexTests.cpp @ 4506:ac69c9f76c71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring ServerIndex::Store()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Feb 2021 17:01:44 +0100
parents 97d103b57cd1
children b4c58795f3a8
comparison
equal deleted inserted replaced
4505:97d103b57cd1 4506:ac69c9f76c71
725 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "instance-" + id, false); 725 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "instance-" + id, false);
726 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image 726 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image
727 727
728 ParsedDicomFile dicom(instance, GetDefaultDicomEncoding(), false /* be strict */); 728 ParsedDicomFile dicom(instance, GetDefaultDicomEncoding(), false /* be strict */);
729 729
730 std::map<MetadataType, std::string> instanceMetadata;
731 DicomInstanceToStore toStore; 730 DicomInstanceToStore toStore;
732 toStore.SetParsedDicomFile(dicom); 731 toStore.SetParsedDicomFile(dicom);
733 732
733 std::map<MetadataType, std::string> instanceMetadata;
734
734 { 735 {
735 DicomMap summary; 736 DicomMap summary;
736 OrthancConfiguration::DefaultExtractDicomSummary(summary, toStore.GetParsedDicomFile()); 737 OrthancConfiguration::DefaultExtractDicomSummary(summary, toStore.GetParsedDicomFile());
737 738
738 DicomInstanceHasher hasher(summary); 739 std::string transferSyntax;
739 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, toStore, summary, hasher, attachments, 740 bool hasTransferSyntax = dicom.LookupTransferSyntax(transferSyntax);
740 false /* don't overwrite */, true /* pixel data offset */, 42)); 741 ASSERT_EQ(StoreStatus_Success, index.Store(
742 instanceMetadata, summary, attachments, toStore.GetMetadata(),
743 toStore.GetOrigin(), false /* don't overwrite */,
744 hasTransferSyntax, transferSyntax, true /* pixel data offset */, 42));
741 } 745 }
742 746
743 ASSERT_EQ(6u, instanceMetadata.size()); 747 ASSERT_EQ(6u, instanceMetadata.size());
744 ASSERT_TRUE(instanceMetadata.find(MetadataType_RemoteAet) != instanceMetadata.end()); 748 ASSERT_TRUE(instanceMetadata.find(MetadataType_RemoteAet) != instanceMetadata.end());
745 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); 749 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end());