Mercurial > hg > orthanc
diff OrthancServer/Internals/CommandDispatcher.cpp @ 665:41b3e5ccb291
fix for medInria
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 07 Nov 2013 16:25:28 +0100 |
parents | d233b5090105 |
children | aa2ab67d913d |
line wrap: on
line diff
--- a/OrthancServer/Internals/CommandDispatcher.cpp Wed Nov 06 17:20:31 2013 +0100 +++ b/OrthancServer/Internals/CommandDispatcher.cpp Thu Nov 07 16:25:28 2013 +0100 @@ -238,6 +238,7 @@ if (server.HasMoveRequestHandlerFactory()) { knownAbstractSyntaxes.push_back(UID_MOVEStudyRootQueryRetrieveInformationModel); + knownAbstractSyntaxes.push_back(UID_MOVEPatientRootQueryRetrieveInformationModel); } cond = ASC_receiveAssociation(net, &assoc, @@ -266,13 +267,12 @@ std::vector<const char*> transferSyntaxes; -#if 0 // This is the list of the transfer syntaxes that were supported up to Orthanc 0.7.1 transferSyntaxes.push_back(UID_LittleEndianExplicitTransferSyntax); transferSyntaxes.push_back(UID_BigEndianExplicitTransferSyntax); transferSyntaxes.push_back(UID_LittleEndianImplicitTransferSyntax); -#else - transferSyntaxes.push_back(UID_LittleEndianImplicitTransferSyntax); + + // New transfer syntaxes supported since Orthanc 0.7.2 transferSyntaxes.push_back(UID_DeflatedExplicitVRLittleEndianTransferSyntax); transferSyntaxes.push_back(UID_JPEGProcess1TransferSyntax); transferSyntaxes.push_back(UID_JPEGProcess2_4TransferSyntax); @@ -303,7 +303,6 @@ transferSyntaxes.push_back(UID_MPEG2MainProfileAtMainLevelTransferSyntax); transferSyntaxes.push_back(UID_MPEG2MainProfileAtHighLevelTransferSyntax); transferSyntaxes.push_back(UID_RLELosslessTransferSyntax); -#endif /* accept the Verification SOP Class if presented */ cond = ASC_acceptContextsWithPreferredTransferSyntaxes( assoc->params, &knownAbstractSyntaxes[0], knownAbstractSyntaxes.size(), &transferSyntaxes[0], transferSyntaxes.size()); @@ -580,7 +579,7 @@ { std::auto_ptr<IFindRequestHandler> handler (server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler()); - cond = Internals::findScp(assoc_, &msg, presID, *handler); + cond = Internals::findScp(assoc_, &msg, presID, *handler, callingAETitle_); } break; @@ -595,6 +594,8 @@ // Bad status, which indicates the closing of the connection by // the peer or a network error finished = true; + + LOG(ERROR) << cond.text(); } if (finished)