comparison OrthancServer/LuaScripting.cpp @ 3858:3ab2d48c8f69 c-get

integration mainline->c-get
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 Apr 2020 16:37:25 +0200
parents 6498739a3c3c
children 8f7ad4989fec
comparison
equal deleted inserted replaced
3818:4f78da5613a1 3858:3ab2d48c8f69
770 catch (OrthancException& e) 770 catch (OrthancException& e)
771 { 771 {
772 LOG(ERROR) << "Error while processing Lua events: " << e.What(); 772 LOG(ERROR) << "Error while processing Lua events: " << e.What();
773 } 773 }
774 } 774 }
775
776 that->jobManager_.GetDicomConnectionManager().CloseIfInactive();
775 } 777 }
776 } 778 }
777 779
778 780
779 void LuaScripting::Start() 781 void LuaScripting::Start()
871 call.PushJson(simplified); 873 call.PushJson(simplified);
872 874
873 Json::Value origin; 875 Json::Value origin;
874 instance.GetOrigin().Format(origin); 876 instance.GetOrigin().Format(origin);
875 call.PushJson(origin); 877 call.PushJson(origin);
878
879 Json::Value info = Json::objectValue;
880 info["HasPixelData"] = instance.HasPixelData();
881
882 std::string s;
883 if (instance.LookupTransferSyntax(s))
884 {
885 info["TransferSyntaxUID"] = s;
886 }
887
888 call.PushJson(info);
876 889
877 if (!call.ExecutePredicate()) 890 if (!call.ExecutePredicate())
878 { 891 {
879 return false; 892 return false;
880 } 893 }