Mercurial > hg > orthanc

comparison OrthancServer/ServerIndex.cpp @ 2726:46061a91c88a jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 12 Jul 2018 18:01:16 +0200
parents d33659c28c6b
children 8aa6aef11b70
comparison
equal deleted inserted replaced
2725:7caf01aa4d7b 2726:46061a91c88a
783 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_ReceptionDate, now); 783 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_ReceptionDate, now);
784 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_RemoteAet, 784 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_RemoteAet,
785 instanceToStore.GetOrigin().GetRemoteAetC()); 785 instanceToStore.GetOrigin().GetRemoteAetC());
786 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_Origin, 786 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_Origin,
787 EnumerationToString(instanceToStore.GetOrigin().GetRequestOrigin())); 787 EnumerationToString(instanceToStore.GetOrigin().GetRequestOrigin()));
788 788
789 { 789 {
790 std::string s; 790 std::string s;
791
791 if (instanceToStore.LookupTransferSyntax(s)) 792 if (instanceToStore.LookupTransferSyntax(s))
792 { 793 {
794 // New in Orthanc 1.2.0
793 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_TransferSyntax, s); 795 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_TransferSyntax, s);
796 }
797
798 if (instanceToStore.GetOrigin().LookupRemoteIp(s))
799 {
800 // New in Orthanc 1.4.0
801 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_RemoteIp, s);
802 }
803
804 if (instanceToStore.GetOrigin().LookupCalledAet(s))
805 {
806 // New in Orthanc 1.4.0
807 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_CalledAet, s);
808 }
809
810 if (instanceToStore.GetOrigin().LookupHttpUsername(s))
811 {
812 // New in Orthanc 1.4.0
813 SetInstanceMetadata(instanceMetadata, instance, MetadataType_Instance_HttpUsername, s);
794 } 814 }
795 } 815 }
796 816
797 const DicomValue* value; 817 const DicomValue* value;
798 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL && 818 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&