comparison OrthancServer/DatabaseWrapper.cpp @ 742:1cd3ec544039

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 19 Mar 2014 20:29:26 +0100
parents 913179bc7cc5
children fd36c80f096f
comparison
equal deleted inserted replaced
741:913179bc7cc5 742:1cd3ec544039
614 Json::Value changes = Json::arrayValue; 614 Json::Value changes = Json::arrayValue;
615 int64_t last = since; 615 int64_t last = since;
616 616
617 while (changes.size() < maxResults && s.Step()) 617 while (changes.size() < maxResults && s.Step())
618 { 618 {
619 int64_t seq = s.ColumnInt(0); 619 int64_t seq = s.ColumnInt64(0);
620 ChangeType changeType = static_cast<ChangeType>(s.ColumnInt(1)); 620 ChangeType changeType = static_cast<ChangeType>(s.ColumnInt(1));
621 int64_t internalId = s.ColumnInt(2); 621 int64_t internalId = s.ColumnInt64(2);
622 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(3)); 622 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(3));
623 const std::string& date = s.ColumnString(4); 623 const std::string& date = s.ColumnString(4);
624 std::string publicId = GetPublicId(internalId); 624 std::string publicId = GetPublicId(internalId);
625 625
626 Json::Value item = Json::objectValue; 626 Json::Value item = Json::objectValue;
682 682
683 s.Run(); 683 s.Run();
684 } 684 }
685 685
686 686
687 void DatabaseWrapper::GetExportedResources(Json::Value& target, 687 void DatabaseWrapper::GetExportedResourcesInternal(Json::Value& target,
688 SQLite::Statement& s, 688 SQLite::Statement& s,
689 int64_t since, 689 int64_t since,
690 unsigned int maxResults) 690 unsigned int maxResults)
691 { 691 {
692 Json::Value changes = Json::arrayValue; 692 Json::Value changes = Json::arrayValue;
693 int64_t last = since; 693 int64_t last = since;
694 694
695 while (changes.size() < maxResults && s.Step()) 695 while (changes.size() < maxResults && s.Step())
744 { 744 {
745 SQLite::Statement s(db_, SQLITE_FROM_HERE, 745 SQLite::Statement s(db_, SQLITE_FROM_HERE,
746 "SELECT * FROM ExportedResources WHERE seq>? ORDER BY seq LIMIT ?"); 746 "SELECT * FROM ExportedResources WHERE seq>? ORDER BY seq LIMIT ?");
747 s.BindInt64(0, since); 747 s.BindInt64(0, since);
748 s.BindInt(1, maxResults + 1); 748 s.BindInt(1, maxResults + 1);
749 GetExportedResources(target, s, since, maxResults); 749 GetExportedResourcesInternal(target, s, since, maxResults);
750 } 750 }
751 751
752 752
753 void DatabaseWrapper::GetLastExportedResource(Json::Value& target) 753 void DatabaseWrapper::GetLastExportedResource(Json::Value& target)
754 { 754 {
755 SQLite::Statement s(db_, SQLITE_FROM_HERE, 755 SQLite::Statement s(db_, SQLITE_FROM_HERE,
756 "SELECT * FROM ExportedResources ORDER BY seq DESC LIMIT 1"); 756 "SELECT * FROM ExportedResources ORDER BY seq DESC LIMIT 1");
757 GetExportedResources(target, s, 0, 1); 757 GetExportedResourcesInternal(target, s, 0, 1);
758 } 758 }
759 759
760 760
761 761
762 762