Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.cpp @ 4200:7112a8af0b63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 16 Sep 2020 20:53:31 +0200
parents bf7b9edf6b81
children 785a2713323e
comparison
equal deleted inserted replaced
4199:fbc49a65340a 4200:7112a8af0b63
559 { 559 {
560 switch (vr) 560 switch (vr)
561 { 561 {
562 case ValueRepresentation_PersonName: 562 case ValueRepresentation_PersonName:
563 { 563 {
564 Json::Value value = Json::objectValue; 564 Json::Value tmp = Json::objectValue;
565 if (!tokens[i].empty()) 565 if (!tokens[i].empty())
566 { 566 {
567 std::vector<std::string> components; 567 std::vector<std::string> components;
568 Toolbox::TokenizeString(components, tokens[i], '='); 568 Toolbox::TokenizeString(components, tokens[i], '=');
569 569
570 if (components.size() >= 1) 570 if (components.size() >= 1)
571 { 571 {
572 value[KEY_ALPHABETIC] = components[0]; 572 tmp[KEY_ALPHABETIC] = components[0];
573 } 573 }
574 574
575 if (components.size() >= 2) 575 if (components.size() >= 2)
576 { 576 {
577 value[KEY_IDEOGRAPHIC] = components[1]; 577 tmp[KEY_IDEOGRAPHIC] = components[1];
578 } 578 }
579 579
580 if (components.size() >= 3) 580 if (components.size() >= 3)
581 { 581 {
582 value[KEY_PHONETIC] = components[2]; 582 tmp[KEY_PHONETIC] = components[2];
583 } 583 }
584 } 584 }
585 585
586 node[KEY_VALUE].append(value); 586 node[KEY_VALUE].append(tmp);
587 break; 587 break;
588 } 588 }
589 589
590 case ValueRepresentation_IntegerString: 590 case ValueRepresentation_IntegerString:
591 { 591 {
602 { 602 {
603 node[KEY_VALUE].append(Json::nullValue); 603 node[KEY_VALUE].append(Json::nullValue);
604 } 604 }
605 else 605 else
606 { 606 {
607 int64_t value = boost::lexical_cast<int64_t>(t); 607 int64_t tmp = boost::lexical_cast<int64_t>(t);
608 node[KEY_VALUE].append(FormatInteger(value)); 608 node[KEY_VALUE].append(FormatInteger(tmp));
609 } 609 }
610 610
611 break; 611 break;
612 } 612 }
613 613
618 { 618 {
619 node[KEY_VALUE].append(Json::nullValue); 619 node[KEY_VALUE].append(Json::nullValue);
620 } 620 }
621 else 621 else
622 { 622 {
623 double value = boost::lexical_cast<double>(t); 623 double tmp = boost::lexical_cast<double>(t);
624 node[KEY_VALUE].append(FormatDouble(value)); 624 node[KEY_VALUE].append(FormatDouble(tmp));
625 } 625 }
626 626
627 break; 627 break;
628 } 628 }
629 629