comparison OrthancServer/OrthancRestApi.cpp @ 317:6253c70b197b

fixes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 21 Dec 2012 17:51:17 +0100
parents d526ac73c886
children 47a709e22d1f
comparison
equal deleted inserted replaced
316:d526ac73c886 317:6253c70b197b
1260 DicomInstanceHasher originalHasher = original.GetHasher(); 1260 DicomInstanceHasher originalHasher = original.GetHasher();
1261 1261
1262 if (isNewSeries) 1262 if (isNewSeries)
1263 { 1263 {
1264 context.GetIndex().SetMetadata 1264 context.GetIndex().SetMetadata
1265 (modifiedHasher.HashSeries(), MetadataType_ModifiedFrom, originalHasher.HashSeries()); 1265 (modifiedHasher.HashSeries(), metadataType, originalHasher.HashSeries());
1266 } 1266 }
1267 1267
1268 if (newStudyId.size() == 0) 1268 if (newStudyId.size() == 0)
1269 { 1269 {
1270 newStudyId = modifiedHasher.HashStudy(); 1270 newStudyId = modifiedHasher.HashStudy();
1271 context.GetIndex().SetMetadata(newStudyId, MetadataType_ModifiedFrom, originalHasher.HashStudy()); 1271 context.GetIndex().SetMetadata(newStudyId, metadataType, originalHasher.HashStudy());
1272 } 1272 }
1273 1273
1274 assert(*it == originalHasher.HashInstance()); 1274 assert(*it == originalHasher.HashInstance());
1275 assert(modifiedInstance == modifiedHasher.HashInstance()); 1275 assert(modifiedInstance == modifiedHasher.HashInstance());
1276 context.GetIndex().SetMetadata(modifiedInstance, MetadataType_ModifiedFrom, *it); 1276 context.GetIndex().SetMetadata(modifiedInstance, metadataType, *it);
1277 } 1277 }
1278 1278
1279 context.GetIndex().LogChange(ChangeType_ModifiedStudy, newStudyId); 1279 context.GetIndex().LogChange(changeType, newStudyId);
1280 1280
1281 assert(newStudyId.size() != 0); 1281 assert(newStudyId.size() != 0);
1282 Json::Value result = Json::objectValue; 1282 Json::Value result = Json::objectValue;
1283 result["ID"] = newStudyId; 1283 result["ID"] = newStudyId;
1284 result["Path"] = GetBasePath(ResourceType_Study, newStudyId); 1284 result["Path"] = GetBasePath(ResourceType_Study, newStudyId);