Mercurial > hg > orthanc

comparison OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp @ 5752:717acb0ea546 find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix DICOMWeb integration tests
author Alain Mazy <am@orthanc.team>
date Tue, 03 Sep 2024 16:37:31 +0200
parents 5d78e5cafabc
children ca06dde85358
comparison
equal deleted inserted replaced
5751:5d78e5cafabc 5752:717acb0ea546
543 } 543 }
544 544
545 // need resource labels ? 545 // need resource labels ?
546 if (request.IsRetrieveLabels()) 546 if (request.IsRetrieveLabels())
547 { 547 {
548 sql = "SELECT id, label " 548 sql = "SELECT Lookup.internalId, label "
549 "FROM Labels " 549 "FROM Labels "
550 "INNER JOIN Lookup ON Labels.id = Lookup.internalId"; 550 "INNER JOIN Lookup ON Labels.id = Lookup.internalId";
551 551
552 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql); 552 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
553 while (s.Step()) 553 while (s.Step())
646 } 646 }
647 647
648 // need children identifiers ? 648 // need children identifiers ?
649 if (requestLevel <= ResourceType_Series && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 1)).IsRetrieveIdentifiers()) 649 if (requestLevel <= ResourceType_Series && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 1)).IsRetrieveIdentifiers())
650 { 650 {
651 sql = "SELECT currentLevel.internalId, childLevel.publicId " 651 sql = "SELECT Lookup.internalId, childLevel.publicId "
652 "FROM Resources AS currentLevel " 652 "FROM Resources AS currentLevel "
653 "INNER JOIN Lookup ON currentLevel.internalId = Lookup.internalId " 653 "INNER JOIN Lookup ON currentLevel.internalId = Lookup.internalId "
654 "INNER JOIN Resources childLevel ON currentLevel.internalId = childLevel.parentId "; 654 "INNER JOIN Resources childLevel ON currentLevel.internalId = childLevel.parentId ";
655 655
656 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql); 656 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
662 } 662 }
663 663
664 // need grandchildren identifiers ? 664 // need grandchildren identifiers ?
665 if (requestLevel <= ResourceType_Study && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 2)).IsRetrieveIdentifiers()) 665 if (requestLevel <= ResourceType_Study && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 2)).IsRetrieveIdentifiers())
666 { 666 {
667 sql = "SELECT currentLevel.internalId, grandChildLevel.publicId " 667 sql = "SELECT Lookup.internalId, grandChildLevel.publicId "
668 "FROM Resources AS currentLevel " 668 "FROM Resources AS currentLevel "
669 "INNER JOIN Lookup ON currentLevel.internalId = Lookup.internalId " 669 "INNER JOIN Lookup ON currentLevel.internalId = Lookup.internalId "
670 "INNER JOIN Resources childLevel ON currentLevel.internalId = childLevel.parentId " 670 "INNER JOIN Resources childLevel ON currentLevel.internalId = childLevel.parentId "
671 "INNER JOIN Resources grandChildLevel ON childLevel.internalId = grandChildLevel.parentId "; 671 "INNER JOIN Resources grandChildLevel ON childLevel.internalId = grandChildLevel.parentId ";
672 672
679 } 679 }
680 680
681 // need resource attachments ? 681 // need resource attachments ?
682 if (request.IsRetrieveAttachments()) 682 if (request.IsRetrieveAttachments())
683 { 683 {
684 sql = "SELECT id, fileType, uuid, uncompressedSize, compressedSize, compressionType, uncompressedMD5, compressedMD5 " 684 sql = "SELECT Lookup.internalId, fileType, uuid, uncompressedSize, compressedSize, compressionType, uncompressedMD5, compressedMD5 "
685 "FROM AttachedFiles " 685 "FROM AttachedFiles "
686 "INNER JOIN Lookup ON AttachedFiles.id = Lookup.internalId"; 686 "INNER JOIN Lookup ON AttachedFiles.id = Lookup.internalId";
687 687
688 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql); 688 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
689 while (s.Step()) 689 while (s.Step())