comparison OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp @ 5579:77570cce8855 find-refactoring

removed redundant FindResponse::resourceId_
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 27 Apr 2024 11:31:39 +0200
parents 5a13483d12c5
children df7324d6e728
comparison
equal deleted inserted replaced
5577:9e74e761b108 5579:77570cce8855
1171 SQLite::Statement statement(db_, SQLITE_FROM_HERE_DYNAMIC(sqlLookup), sqlLookup); 1171 SQLite::Statement statement(db_, SQLITE_FROM_HERE_DYNAMIC(sqlLookup), sqlLookup);
1172 formatter.Bind(statement); 1172 formatter.Bind(statement);
1173 1173
1174 while (statement.Step()) 1174 while (statement.Step())
1175 { 1175 {
1176 OrthancIdentifiers id;
1177 id.SetLevel(request.GetLevel(), statement.ColumnString(0));
1178
1176 FindResponse::Item* item = new FindResponse::Item(request.GetResponseContent(), 1179 FindResponse::Item* item = new FindResponse::Item(request.GetResponseContent(),
1177 request.GetLevel(), 1180 request.GetLevel(), id);
1178 statement.ColumnString(0));
1179 response.Add(item); 1181 response.Add(item);
1180 } 1182 }
1181 } 1183 }
1182 else 1184 else
1183 { 1185 {
1196 SQLite::Statement statement(db_, SQLITE_FROM_HERE, "SELECT publicId FROM FilteredResourcesIds"); 1198 SQLite::Statement statement(db_, SQLITE_FROM_HERE, "SELECT publicId FROM FilteredResourcesIds");
1197 formatter.Bind(statement); 1199 formatter.Bind(statement);
1198 1200
1199 while (statement.Step()) 1201 while (statement.Step())
1200 { 1202 {
1201 const std::string& resourceId = statement.ColumnString(0); 1203 const std::string resourceId = statement.ColumnString(0);
1204
1205 OrthancIdentifiers id;
1206 id.SetLevel(request.GetLevel(), resourceId);
1207
1202 FindResponse::Item* item = new FindResponse::Item(request.GetResponseContent(), 1208 FindResponse::Item* item = new FindResponse::Item(request.GetResponseContent(),
1203 request.GetLevel(), 1209 request.GetLevel(), id);
1204 resourceId);
1205 items[resourceId] = item; 1210 items[resourceId] = item;
1206 response.Add(item); 1211 response.Add(item);
1207 } 1212 }
1208 } 1213 }
1209 1214