Mercurial > hg > orthanc
comparison OrthancServer/OrthancRestApi/OrthancRestModalities.cpp @ 810:401a9633e492
configuration into a namespace
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 07 May 2014 16:47:56 +0200 |
parents | 2d9a000aa3a6 |
children | 8a36c947490c |
comparison
equal
deleted
inserted
replaced
809:8ce2f69436ca | 810:401a9633e492 |
---|---|
73 if (!MergeQueryAndTemplate(m, call.GetPostBody())) | 73 if (!MergeQueryAndTemplate(m, call.GetPostBody())) |
74 { | 74 { |
75 return; | 75 return; |
76 } | 76 } |
77 | 77 |
78 RemoteModalityParameters remote = GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); | 78 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); |
79 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); | 79 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); |
80 | 80 |
81 DicomFindAnswers answers; | 81 DicomFindAnswers answers; |
82 locker.GetConnection().FindPatient(answers, m); | 82 locker.GetConnection().FindPatient(answers, m); |
83 | 83 |
101 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) | 101 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) |
102 { | 102 { |
103 return; | 103 return; |
104 } | 104 } |
105 | 105 |
106 RemoteModalityParameters remote = GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); | 106 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); |
107 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); | 107 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); |
108 | 108 |
109 DicomFindAnswers answers; | 109 DicomFindAnswers answers; |
110 locker.GetConnection().FindStudy(answers, m); | 110 locker.GetConnection().FindStudy(answers, m); |
111 | 111 |
130 m.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString().size() <= 2) | 130 m.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString().size() <= 2) |
131 { | 131 { |
132 return; | 132 return; |
133 } | 133 } |
134 | 134 |
135 RemoteModalityParameters remote = GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); | 135 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); |
136 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); | 136 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); |
137 | 137 |
138 DicomFindAnswers answers; | 138 DicomFindAnswers answers; |
139 locker.GetConnection().FindSeries(answers, m); | 139 locker.GetConnection().FindSeries(answers, m); |
140 | 140 |
160 m.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).AsString().size() <= 2) | 160 m.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).AsString().size() <= 2) |
161 { | 161 { |
162 return; | 162 return; |
163 } | 163 } |
164 | 164 |
165 RemoteModalityParameters remote = GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); | 165 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); |
166 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); | 166 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); |
167 | 167 |
168 DicomFindAnswers answers; | 168 DicomFindAnswers answers; |
169 locker.GetConnection().FindInstance(answers, m); | 169 locker.GetConnection().FindInstance(answers, m); |
170 | 170 |
182 if (!MergeQueryAndTemplate(m, call.GetPostBody())) | 182 if (!MergeQueryAndTemplate(m, call.GetPostBody())) |
183 { | 183 { |
184 return; | 184 return; |
185 } | 185 } |
186 | 186 |
187 RemoteModalityParameters remote = GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); | 187 RemoteModalityParameters remote = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", "")); |
188 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); | 188 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), remote); |
189 | 189 |
190 DicomFindAnswers patients; | 190 DicomFindAnswers patients; |
191 locker.GetConnection().FindPatient(patients, m); | 191 locker.GetConnection().FindPatient(patients, m); |
192 | 192 |
317 if (!GetInstancesToExport(instances, remote, call)) | 317 if (!GetInstancesToExport(instances, remote, call)) |
318 { | 318 { |
319 return; | 319 return; |
320 } | 320 } |
321 | 321 |
322 RemoteModalityParameters p = GetModalityUsingSymbolicName(remote); | 322 RemoteModalityParameters p = Configuration::GetModalityUsingSymbolicName(remote); |
323 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), p); | 323 ReusableDicomUserConnection::Locker locker(context.GetReusableDicomUserConnection(), p); |
324 | 324 |
325 for (std::list<std::string>::const_iterator | 325 for (std::list<std::string>::const_iterator |
326 it = instances.begin(); it != instances.end(); ++it) | 326 it = instances.begin(); it != instances.end(); ++it) |
327 { | 327 { |
345 } | 345 } |
346 | 346 |
347 static void ListPeers(RestApi::GetCall& call) | 347 static void ListPeers(RestApi::GetCall& call) |
348 { | 348 { |
349 OrthancRestApi::SetOfStrings peers; | 349 OrthancRestApi::SetOfStrings peers; |
350 GetListOfOrthancPeers(peers); | 350 Configuration::GetListOfOrthancPeers(peers); |
351 | 351 |
352 Json::Value result = Json::arrayValue; | 352 Json::Value result = Json::arrayValue; |
353 for (OrthancRestApi::SetOfStrings::const_iterator | 353 for (OrthancRestApi::SetOfStrings::const_iterator |
354 it = peers.begin(); it != peers.end(); ++it) | 354 it = peers.begin(); it != peers.end(); ++it) |
355 { | 355 { |
360 } | 360 } |
361 | 361 |
362 static void ListPeerOperations(RestApi::GetCall& call) | 362 static void ListPeerOperations(RestApi::GetCall& call) |
363 { | 363 { |
364 OrthancRestApi::SetOfStrings peers; | 364 OrthancRestApi::SetOfStrings peers; |
365 GetListOfOrthancPeers(peers); | 365 Configuration::GetListOfOrthancPeers(peers); |
366 | 366 |
367 std::string id = call.GetUriComponent("id", ""); | 367 std::string id = call.GetUriComponent("id", ""); |
368 if (IsExistingPeer(peers, id)) | 368 if (IsExistingPeer(peers, id)) |
369 { | 369 { |
370 Json::Value result = Json::arrayValue; | 370 Json::Value result = Json::arrayValue; |
384 { | 384 { |
385 return; | 385 return; |
386 } | 386 } |
387 | 387 |
388 OrthancPeerParameters peer; | 388 OrthancPeerParameters peer; |
389 GetOrthancPeer(peer, remote); | 389 Configuration::GetOrthancPeer(peer, remote); |
390 | 390 |
391 // Configure the HTTP client | 391 // Configure the HTTP client |
392 HttpClient client; | 392 HttpClient client; |
393 if (peer.GetUsername().size() != 0 && | 393 if (peer.GetUsername().size() != 0 && |
394 peer.GetPassword().size() != 0) | 394 peer.GetPassword().size() != 0) |
429 } | 429 } |
430 | 430 |
431 static void ListModalities(RestApi::GetCall& call) | 431 static void ListModalities(RestApi::GetCall& call) |
432 { | 432 { |
433 OrthancRestApi::SetOfStrings modalities; | 433 OrthancRestApi::SetOfStrings modalities; |
434 GetListOfDicomModalities(modalities); | 434 Configuration::GetListOfDicomModalities(modalities); |
435 | 435 |
436 Json::Value result = Json::arrayValue; | 436 Json::Value result = Json::arrayValue; |
437 for (OrthancRestApi::SetOfStrings::const_iterator | 437 for (OrthancRestApi::SetOfStrings::const_iterator |
438 it = modalities.begin(); it != modalities.end(); ++it) | 438 it = modalities.begin(); it != modalities.end(); ++it) |
439 { | 439 { |
445 | 445 |
446 | 446 |
447 static void ListModalityOperations(RestApi::GetCall& call) | 447 static void ListModalityOperations(RestApi::GetCall& call) |
448 { | 448 { |
449 OrthancRestApi::SetOfStrings modalities; | 449 OrthancRestApi::SetOfStrings modalities; |
450 GetListOfDicomModalities(modalities); | 450 Configuration::GetListOfDicomModalities(modalities); |
451 | 451 |
452 std::string id = call.GetUriComponent("id", ""); | 452 std::string id = call.GetUriComponent("id", ""); |
453 if (IsExistingModality(modalities, id)) | 453 if (IsExistingModality(modalities, id)) |
454 { | 454 { |
455 Json::Value result = Json::arrayValue; | 455 Json::Value result = Json::arrayValue; |
471 if (reader.parse(call.GetPutBody(), json)) | 471 if (reader.parse(call.GetPutBody(), json)) |
472 { | 472 { |
473 RemoteModalityParameters modality; | 473 RemoteModalityParameters modality; |
474 modality.FromJson(json); | 474 modality.FromJson(json); |
475 modality.SetName(call.GetUriComponent("id", "")); | 475 modality.SetName(call.GetUriComponent("id", "")); |
476 UpdateModality(modality); | 476 Configuration::UpdateModality(modality); |
477 } | 477 } |
478 } | 478 } |
479 | 479 |
480 | 480 |
481 static void DeleteModality(RestApi::DeleteCall& call) | 481 static void DeleteModality(RestApi::DeleteCall& call) |
482 { | 482 { |
483 RemoveModality(call.GetUriComponent("id", "")); | 483 Configuration::RemoveModality(call.GetUriComponent("id", "")); |
484 } | 484 } |
485 | 485 |
486 | 486 |
487 static void UpdatePeer(RestApi::PutCall& call) | 487 static void UpdatePeer(RestApi::PutCall& call) |
488 { | 488 { |
491 if (reader.parse(call.GetPutBody(), json)) | 491 if (reader.parse(call.GetPutBody(), json)) |
492 { | 492 { |
493 OrthancPeerParameters peer; | 493 OrthancPeerParameters peer; |
494 peer.FromJson(json); | 494 peer.FromJson(json); |
495 peer.SetName(call.GetUriComponent("id", "")); | 495 peer.SetName(call.GetUriComponent("id", "")); |
496 UpdatePeer(peer); | 496 Configuration::UpdatePeer(peer); |
497 } | 497 } |
498 } | 498 } |
499 | 499 |
500 | 500 |
501 static void DeletePeer(RestApi::DeleteCall& call) | 501 static void DeletePeer(RestApi::DeleteCall& call) |
502 { | 502 { |
503 RemovePeer(call.GetUriComponent("id", "")); | 503 Configuration::RemovePeer(call.GetUriComponent("id", "")); |
504 } | 504 } |
505 | 505 |
506 | 506 |
507 void OrthancRestApi::RegisterModalities() | 507 void OrthancRestApi::RegisterModalities() |
508 { | 508 { |