Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 812:8a36c947490c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 08 May 2014 14:51:49 +0200
parents 401a9633e492
children aeee9cc66dd9
comparison
equal deleted inserted replaced
811:78b9f64b6b7b 812:8a36c947490c
523 throw OrthancException("Unknown modality for AET: " + aet); 523 throw OrthancException("Unknown modality for AET: " + aet);
524 } 524 }
525 } 525 }
526 526
527 527
528 void Configuration::UpdateModality(const RemoteModalityParameters& modality) 528 void Configuration::UpdateModality(const std::string& symbolicName,
529 const RemoteModalityParameters& modality)
529 { 530 {
530 boost::mutex::scoped_lock lock(globalMutex_); 531 boost::mutex::scoped_lock lock(globalMutex_);
531 532
532 if (!configuration_->isMember("DicomModalities")) 533 if (!configuration_->isMember("DicomModalities"))
533 { 534 {
538 if (modalities.type() != Json::objectValue) 539 if (modalities.type() != Json::objectValue)
539 { 540 {
540 throw OrthancException(ErrorCode_BadFileFormat); 541 throw OrthancException(ErrorCode_BadFileFormat);
541 } 542 }
542 543
543 modalities.removeMember(modality.GetName().c_str()); 544 modalities.removeMember(symbolicName);
544 545
545 Json::Value v; 546 Json::Value v;
546 modality.ToJson(v); 547 modality.ToJson(v);
547 modalities[modality.GetName()] = v; 548 modalities[symbolicName] = v;
548 } 549 }
549 550
550 551
551 void Configuration::RemoveModality(const std::string& symbolicName) 552 void Configuration::RemoveModality(const std::string& symbolicName)
552 { 553 {
565 566
566 modalities.removeMember(symbolicName.c_str()); 567 modalities.removeMember(symbolicName.c_str());
567 } 568 }
568 569
569 570
570 void Configuration::UpdatePeer(const OrthancPeerParameters& peer) 571 void Configuration::UpdatePeer(const std::string& symbolicName,
572 const OrthancPeerParameters& peer)
571 { 573 {
572 boost::mutex::scoped_lock lock(globalMutex_); 574 boost::mutex::scoped_lock lock(globalMutex_);
573 575
574 if (!configuration_->isMember("OrthancPeers")) 576 if (!configuration_->isMember("OrthancPeers"))
575 { 577 {
580 if (peers.type() != Json::objectValue) 582 if (peers.type() != Json::objectValue)
581 { 583 {
582 throw OrthancException(ErrorCode_BadFileFormat); 584 throw OrthancException(ErrorCode_BadFileFormat);
583 } 585 }
584 586
585 peers.removeMember(peer.GetName().c_str()); 587 peers.removeMember(symbolicName);
586 588
587 Json::Value v; 589 Json::Value v;
588 peer.ToJson(v); 590 peer.ToJson(v);
589 peers[peer.GetName()] = v; 591 peers[symbolicName] = v;
590 } 592 }
591 593
592 594
593 void Configuration::RemovePeer(const std::string& symbolicName) 595 void Configuration::RemovePeer(const std::string& symbolicName)
594 { 596 {