Mercurial > hg > orthanc

comparison UnitTestsSources/ServerIndexTests.cpp @ 3920:82e88ff003d7 c-get

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> c-get
author Alain Mazy <alain@mazy.be>
date Tue, 12 May 2020 14:58:24 +0200
parents 023b2a9f3aa1
children bd0af2e11325
comparison
equal deleted inserted replaced
3918:dba48c162b7b 3920:82e88ff003d7
724 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image 724 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image
725 725
726 std::map<MetadataType, std::string> instanceMetadata; 726 std::map<MetadataType, std::string> instanceMetadata;
727 DicomInstanceToStore toStore; 727 DicomInstanceToStore toStore;
728 toStore.SetSummary(instance); 728 toStore.SetSummary(instance);
729 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, toStore, attachments)); 729 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, toStore, attachments,
730 false /* don't overwrite */));
730 ASSERT_EQ(5u, instanceMetadata.size()); 731 ASSERT_EQ(5u, instanceMetadata.size());
731 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); 732 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end());
732 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); 733 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end());
733 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_TransferSyntax) != instanceMetadata.end()); 734 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_TransferSyntax) != instanceMetadata.end());
734 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end()); 735 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end());
801 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "sop", false); 802 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "sop", false);
802 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image 803 instance.SetValue(DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); // CR image
803 804
804 DicomInstanceHasher hasher(instance); 805 DicomInstanceHasher hasher(instance);
805 std::string id = hasher.HashInstance(); 806 std::string id = hasher.HashInstance();
806 context.GetIndex().SetOverwriteInstances(overwrite); 807 context.SetOverwriteInstances(overwrite);
807 808
808 uint64_t diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances; 809 uint64_t diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances;
809 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients, 810 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
810 countStudies, countSeries, countInstances); 811 countStudies, countSeries, countInstances);
811 812
817 toStore.SetSummary(instance); 818 toStore.SetSummary(instance);
818 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins()); 819 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins());
819 ASSERT_EQ(id, toStore.GetHasher().HashInstance()); 820 ASSERT_EQ(id, toStore.GetHasher().HashInstance());
820 821
821 std::string id2; 822 std::string id2;
822 ASSERT_EQ(StoreStatus_Success, context.Store(id2, toStore)); 823 ASSERT_EQ(StoreStatus_Success, context.Store(id2, toStore, StoreInstanceMode_Default));
823 ASSERT_EQ(id, id2); 824 ASSERT_EQ(id, id2);
824 } 825 }
825 826
826 FileInfo dicom1, json1; 827 FileInfo dicom1, json1;
827 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom1, id, FileContentType_Dicom)); 828 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom1, id, FileContentType_Dicom));
852 DicomInstanceToStore toStore; 853 DicomInstanceToStore toStore;
853 toStore.SetSummary(instance2); 854 toStore.SetSummary(instance2);
854 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins()); 855 toStore.SetOrigin(DicomInstanceOrigin::FromPlugins());
855 856
856 std::string id2; 857 std::string id2;
857 ASSERT_EQ(overwrite ? StoreStatus_Success : StoreStatus_AlreadyStored, context.Store(id2, toStore)); 858 ASSERT_EQ(overwrite ? StoreStatus_Success : StoreStatus_AlreadyStored,
859 context.Store(id2, toStore, StoreInstanceMode_Default));
858 ASSERT_EQ(id, id2); 860 ASSERT_EQ(id, id2);
859 } 861 }
860 862
861 FileInfo dicom2, json2; 863 FileInfo dicom2, json2;
862 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom2, id, FileContentType_Dicom)); 864 ASSERT_TRUE(context.GetIndex().LookupAttachment(dicom2, id, FileContentType_Dicom));